yousty-activeadmin 1.0.4.pre → 1.0.5.pre

data/config/locales/ru.yml

@@ -9,9 +9,7 @@ ru:
     delete: "Удалить"
     delete_confirmation: "Вы уверены, что хотите удалить это?"
     new_model: "Создать %{model}"
-    create_model: "Создать %{model}"
     edit_model: "Изменить %{model}"
-    update_model: "Изменить %{model}"
     delete_model: "Удалить %{model}"
     details: "%{model} подробнее"
     cancel: "Отмена"
@@ -20,8 +18,8 @@ ru:
     next: "След."
     download: "Загрузка:"
     has_many_new: "Добавить %{model}"
-    has_many_delete: "Убрать"
-    has_many_remove: "Удалить"
+    has_many_delete: "Удалить"
+    has_many_remove: "Убрать"
     filters:
       buttons:
         filter: "Фильтровать"
@@ -33,6 +31,9 @@ ru:
         ends_with: "Заканчивается"
         greater_than: "больше"
         less_than: "меньше"
+    status_tag:
+      "yes": "Да"
+      "no": "Нет"
     main_content: "Создайте %{model}#main_content для отображения содержимого."
     logout: "Выйти"
     powered_by: "Powered by %{active_admin} %{version}"
@@ -46,14 +47,19 @@ ru:
       multiple_without_total: "Результат: %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b>"
       entry:
         one: "запись"
+        few: "записи"
+        many: "записей"
         other: "записей"
     any: "Любой"
     blank_slate:
       content: "Пока нет %{resource_name}."
       link: "Создать"
+    dropdown_actions:
+      button_label: "Oперации"
     batch_actions:
       button_label: "Групповые операции"
-      delete_confirmation: "Вы уверены, что хотите удалить %{plural_model}? Вы не сможете это отменить."
+      default_confirmation: "Вы уверены, что вы хотите это сделать?"
+      delete_confirmation: "Вы уверены, что хотите удалить %{plural_model}?"
       succesfully_destroyed:
         one: "Успешно удалено: 1 %{model}"
         few: "Успешно удалено: %{count} %{plural_model}"
@@ -73,10 +79,22 @@ ru:
       add: "Добавить Комментарий"
       resource: "Ресурс"
       no_comments_yet: "Пока нет комментариев."
+      author_missing: "Аноним"
       title_content: "Комментарии (%{count})"
       errors:
         empty_text: "Комментарий не сохранен, текст не должен быть пустым."
     devise:
+      username:
+        title: "Имя пользователя"
+      email:
+        title: "Эл. почта"
+      subdomain:
+        title: "Поддомен"
+      password:
+        title: "Пароль"
+      sign_up:
+        title: "Зарегистрироваться"
+        submit: "Зарегистрироваться"
       login:
         title: "Войти"
         remember_me: "Запомнить меня"
@@ -90,6 +108,9 @@ ru:
       unlock:
         title: "Повторно отправить инструкции по разблокировке"
         submit: "Повторно отправить инструкции по разблокировке"
+      resend_confirmation_instructions:
+        title: "Выслать повторно письмо с активацией"
+        submit: "Выслать повторно письмо с активацией"
       links:
         sign_in: "Войти"
         forgot_your_password: "Забыли пароль?"

data/config/locales/sv-SE.yml

@@ -5,13 +5,11 @@
       welcome: "Välkommen till Active Admin. Detta är ditt standardskrivbord."
       call_to_action: "För att lägga till sektioner, gör en checkout på 'app/admin/dashboard.rb'"
     view: "Visa"
-    edit: "Editera"
+    edit: "Redigera"
     delete: "Ta bort"
     delete_confirmation: "Är du säker att du vill ta bort denna?"
     new_model: "Ny %{model}"
-    create_model: "Ny %{model}"
-    edit_model: "Editera %{model}"
-    update_model: "Editera %{model}"
+    edit_model: "Redigera %{model}"
     delete_model: "Ta bort %{model}"
     details: "Detaljvy för %{model}"
     cancel: "Avbryt"
@@ -33,6 +31,9 @@
         ends_with: "Slutar med"
         greater_than: "Större än"
         less_than: "Mindre än"
+    status_tag:
+      "yes": "Ja"
+      "no": "Ingen"
     main_content: "Implementera %{model}#main_content för att kunna visa något."
     logout: "Logga ut"
     powered_by: "Powered by %{active_admin} %{version}"
@@ -51,9 +52,12 @@
     blank_slate:
       content: "Finns ingen %{resource_name} än."
       link: "Skapa en"
+    dropdown_actions:
+      button_label: "Behandling"
     batch_actions:
       button_label: "Batch Behandling"
-      delete_confirmation: "Är du säker på att du vill radera dessa %{plural_model}? Du kan inte ångra detta."
+      default_confirmation: "Är du säker på att du vill göra detta?"
+      delete_confirmation: "Är du säker på att du vill radera dessa %{plural_model}?"
       succesfully_destroyed:
         one: "Lyckades radera 1 %{model}"
         other: "Lyckades radera %{count} %{plural_model}"

data/config/locales/tr.yml

@@ -9,9 +9,7 @@ tr:
     delete: "Sil"
     delete_confirmation: "Bu kaydı silmek istediğine emin misin?"
     new_model: "Yeni %{model}"
-    create_model: "Yeni %{model}"
     edit_model: "%{model} modelini düzenle"
-    update_model: "%{model} modelini düzenle"
     delete_model: "%{model} modelini sil"
     details: "%{model} ayrıntıları"
     cancel: "İptal"
@@ -33,6 +31,9 @@ tr:
         ends_with: "ile biter"
         greater_than: "Büyükse"
         less_than: "Küçükse"
+    status_tag:
+      "yes": "Evet"
+      "no": "Hayır"
     main_content: "İçeriği görüntülemek için lütfen %{model}#main_content metodunu ekleyin."
     logout: "Oturumu Sonlandır"
     powered_by: "Powered by %{active_admin} %{version}"
@@ -51,9 +52,12 @@ tr:
     blank_slate:
       content: "Herhangi bir %{resource_name} kaydı bulunamadı"
       link: "Bir tane oluşturun"
+    dropdown_actions:
+      button_label: "Işlemler"
     batch_actions:
       button_label: "Toplu işlemler"
-      delete_confirmation: "%{plural_model} kayıtlarını silmek istediğinize emin misiniz? Dikkat bu işlemin geri dönüşü yoktur!"
+      default_confirmation: "Bunu yapmak istediğinden emin misin?"
+      delete_confirmation: "%{plural_model} kayıtlarını silmek istediğinize emin misiniz?"
       succesfully_destroyed:
         one: "1 %{model} kaydı başarıyla silindi."
         other: "Toplam %{count} kayıt %{plural_model} modelinden silindi"
@@ -83,6 +87,9 @@ tr:
       change_password:
         title: "Şifrenizi değiştirin"
         submit: "Şifremi değiştir"
+      resend_confirmation_instructions:
+        title: "Onaylama talimatlarını tekrar gönder"
+        submit: "Onaylama talimatlarını tekrar gönder"
       links:
         sign_in: "Oturum aç"
         forgot_your_password: "Şifreni mi unuttun?"

data/config/locales/uk.yml

@@ -9,9 +9,7 @@ uk:
     delete: "Видалити"
     delete_confirmation: "Ви впевнені, що хочете це видалити?"
     new_model: "Створити %{model}"
-    create_model: "Створити %{model}"
     edit_model: "Змінити %{model}"
-    update_model: "Змінити %{model}"
     delete_model: "Видалити %{model}"
     details: "%{model} детальніше"
     cancel: "Відміна"
@@ -22,14 +20,20 @@ uk:
     has_many_new: "Додати %{model}"
     has_many_delete: "Прибрати"
     has_many_remove: "Видалити"
-    filter: "Фільтрувати"
-    clear_filters: "Очистити"
-    contains: "Містить"
-    starts_with: "Починається з"
-    ends_with: "Закінчується"
-    equal_to: "="
-    greater_than: "більше"
-    less_than: "менше"
+    filters:
+      buttons:
+        filter: "Фільтрувати"
+        clear: "Очистити"
+      predicates:
+        contains: "Містить"
+        equals: "="
+        starts_with: "Починається з"
+        ends_with: "Закінчується"
+        greater_than: "більше"
+        less_than: "меньше"
+    status_tag:
+      "yes": "та"
+      "no": "немає"
     main_content: "Створіть %{model}#main_content для відображення вмісту."
     logout: "Вийти"
     powered_by: "Powered by %{active_admin} %{version}"
@@ -44,17 +48,22 @@ uk:
       entry:
         one: "запис"
         other: "записів"
+        many: "записів"
+        few: "записи"
     any: "Будь-який"
     blank_slate:
       content: "Покищо немає %{resource_name}."
       link: "Створити"
+    dropdown_actions:
+      button_label: "Oперації"
     batch_actions:
       button_label: "Групові операції"
-      delete_confirmation: "Ви впевнені, що хочете видалити %{plural_model}? Ви не зможете це відмінити."
+      default_confirmation: "Ви справді бажаєте це зробити?"
+      delete_confirmation: "Ви впевнені, що хочете видалити %{plural_model}?"
       succesfully_destroyed:
         one: "Успішно видалено: 1 %{model}"
         few: "Успішно видалено: %{count} %{plural_model}"
-        many: "Успішно видалено: %{count} %{plural_model}"        
+        many: "Успішно видалено: %{count} %{plural_model}"
         other: "Успішно видалено: %{count} %{plural_model}"
       selection_toggle_explanation: "(Відмінити все / Зняти виділення)"
       link: "Створити"
@@ -70,10 +79,22 @@ uk:
       add: "Додати Коментар"
       resource: "Ресурс"
       no_comments_yet: "Покищо немає коментарів."
+      author_missing: "Анонім"
       title_content: "Коментарі (%{count})"
       errors:
         empty_text: "Коментар не збережено, текст не повинен бути пустим."
     devise:
+      username:
+        title: "Ім'я користувача"
+      email:
+        title: "Ел. пошта"
+      subdomain:
+        title: "Піддомен"
+      password:
+        title: "Пароль"
+      sign_up:
+        title: "Зареєструватися"
+        submit: "Зареєструватися"
       login:
         title: "Вхід"
         remember_me: "Запам'ятати мене"
@@ -87,6 +108,9 @@ uk:
       unlock:
         title: "Відправити повторно інструкції з розблокування"
         submit: "Відправити повторно інструкції з розблокування"
+      resend_confirmation_instructions:
+        title: "Вислати повторно листа з активацією"
+        submit: "Вислати повторно листа з активацією"
       links:
         sign_in: "Увійти"
         forgot_your_password: "Забули пароль?"

data/config/locales/vi.yml

@@ -9,9 +9,7 @@ vi:
     delete: "Xóa"
     delete_confirmation: "Bạn có chắc chắn rằng mình muốn xóa cái này?"
     new_model: "Tạo mới %{model}"
-    create_model: "Tạo mới %{model}"
     edit_model: "Chỉnh sửa %{model}"
-    update_model: "Chỉnh sửa %{model}"
     delete_model: "Xóa %{model}"
     details: "%{model} Chi tiết"
     cancel: "Hủy"
@@ -33,6 +31,9 @@ vi:
         ends_with: "Kết thúc với việc"
         greater_than: "Lớn hơn"
         less_than: "Nhỏ hơn"
+    status_tag:
+      "yes": "Có"
+      "no": "Không Có"
     main_content: "Xin bổ sung %{model}#main_content để hiển thị nội dung."
     logout: "Đăng xuất"
     powered_by: "Powered by %{active_admin} %{version}"
@@ -51,9 +52,12 @@ vi:
     blank_slate:
       content: "Chưa có %{resource_name}."
       link: "Tạo mới"
+    dropdown_actions:
+      button_label: "Hành động"
     batch_actions:
       button_label: "Hành động hàng loạt"
-      delete_confirmation: "Bạn có chắc chắn muốn xóa những %{plural_model}? Bạn sẽ không thể lấy lại được dữ liệu."
+      default_confirmation: "Bạn có chắc bạn muốn làm điều này?"
+      delete_confirmation: "Bạn có chắc chắn muốn xóa những %{plural_model}?"
       succesfully_destroyed:
         one: "Đã xóa thành công 1 %{model}"
         other: "Đã xóa thành công %{count} %{plural_model}"

data/config/locales/zh-CN.yml

@@ -9,9 +9,7 @@
     delete: "删除"
     delete_confirmation: "确定删除?"
     new_model: "新建%{model}"
-    create_model: "新建%{model}"
     edit_model: "编辑%{model}"
-    update_model: "编辑%{model}"
     delete_model: "删除%{model}"
     details: "%{model}详情"
     cancel: "取消"
@@ -33,6 +31,9 @@
         ends_with: "完与"
         greater_than: "大于"
         less_than: "小于"
+    status_tag:
+      "yes": "是的"
+      "no": "无"
     main_content: "请执行 %{model}#main_content 来显示内容."
     logout: "退出"
     powered_by: "Powered by %{active_admin} %{version}"
@@ -51,9 +52,12 @@
     blank_slate:
       content: "暂时还没有%{resource_name}."
       link: "新建一个"
+    dropdown_actions:
+      button_label: "行动"
     batch_actions:
       button_label: "批处理"
-      delete_confirmation: "你确定要删除所有%{plural_model}? 如果执行，将不可恢复."
+      default_confirmation: "你确定你要这样做？"
+      delete_confirmation: "你确定要删除所有%{plural_model}?"
       succesfully_destroyed:
         one: "成功删除 1 %{model}"
         other: "成功删除 %{count} %{plural_model}"
@@ -73,18 +77,30 @@
       errors:
         empty_text: "评论保存失败，内空不能为空."
     devise:
+      username:
+        title: "用户名"
+      email:
+        title: "邮箱"
+      subdomain:
+        title: "子域"
+      password:
+        title: "密码"
       login:
         title: "登录"
         remember_me: "记住我"
         submit: "登录"
       reset_password:
-        title: "忘记密码？"
-        submit: "重置密码"
-      change_password:
-        title: "更改您的密码"
-        submit: "更改我的密码"
+        title: "忘记了密码？"
+        submit: "重置我的密码"
+      unlock:
+        title: "重新发送送解锁命令"
+        submit: "重新发送送解锁命令"
+      resend_confirmation_instructions:
+        title: " 重新发送确认指示"
+        submit: " 重新发送确认指示"
       links:
         sign_in: "登录"
-        forgot_your_password: "忘记密码？"
+        forgot_your_password: "忘记了密码？"
         sign_in_with_omniauth_provider: "登入%{provider}"
-
+    access_denied:
+      message: "您无权处理此操作"

data/config/locales/zh-TW.yml

@@ -2,16 +2,14 @@
   active_admin:
     dashboard: 儀表板
     dashboard_welcome:
-      welcome: "歡迎來到 Active Admin 這是預設的儀表板頁面。"
+      welcome: "歡迎來到 Active Admin，這是預設的儀表板頁面。"
       call_to_action: "要新增儀表板內容，請查看 'app/admin/dashboard.rb'"
     view: "檢視"
     edit: "編輯"
     delete: "刪除"
     delete_confirmation: "你確定要刪除嗎？"
     new_model: "新增 %{model}"
-    create_model: "新增 %{model}"
     edit_model: "編輯 %{model}"
-    update_model: "編輯 %{model}"
     delete_model: "刪除 %{model}"
     details: "%{model} 明細"
     cancel: "取消"
@@ -29,11 +27,14 @@
       predicates:
         contains: "包含"
         equals: "等於"
-        starts_with: "开头"
-        ends_with: "完与"
+        starts_with: "開頭為"
+        ends_with: "結尾為"
         greater_than: "大於"
         less_than: "小於"
-    main_content: "請編寫 %{model}#main_content 以顯示內容。"
+    status_tag:
+      "yes": "是"
+      "no": "否"
+    main_content: "請實作 %{model}#main_content 以顯示內容。"
     logout: "登出"
     powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
@@ -51,13 +52,16 @@
     blank_slate:
       content: "尚無 %{resource_name}"
       link: "建立一筆"
+    dropdown_actions:
+      button_label: "操作"
     batch_actions:
       button_label: "批次作業"
-      delete_confirmation: "您確定要刪除這些 %{plural_model} 嗎？此動作無法復原。"
+      default_confirmation: "你確定你要這樣做？"
+      delete_confirmation: "你確定要刪除這些 %{plural_model} 嗎？"
       succesfully_destroyed:
         one: "成功刪除 1 %{model}"
         other: "成功刪除 %{count} %{plural_model}"
-      selection_toggle_explanation: "(切換選取)"
+      selection_toggle_explanation: "（切換選取）"
       link: "建立一個"
       action_label: "%{title} 已選取"
       labels:
@@ -74,17 +78,19 @@
         empty_text: "評論儲存失敗，不允許空白的內容。"
     devise:
       login:
-        title: "登錄"
+        title: "登入"
         remember_me: "記住我"
-        submit: "登錄"
+        submit: "登入"
       reset_password:
         title: "忘記密碼？"
         submit: "重置密碼"
       change_password:
-        title: "更改您的密碼"
+        title: "更改你的密碼"
         submit: "更改我的密碼"
+      resend_confirmation_instructions:
+        title: '重新發送確認信'
+        submit: '重新發送確認信'
       links:
-        sign_in: "登錄"
+        sign_in: "登入"
         forgot_your_password: "忘記密碼？"
         sign_in_with_omniauth_provider: "登入%{provider}"
-

data/docs/0-installation.md

@@ -11,12 +11,15 @@ that can be injected into your existing Ruby on Rails application.
 
 ## Setting up Active Admin
 
-After installing the gem, you need to run the generator:
+After installing the gem, you need to run the generator. By default we use Devise, and
+the generator creates an `AdminUser` model. If you want to create a different model
+(or modify an existing one for use with Devise) you can pass it as an argument.
+If you want to skip Devise configuration entirely, you can pass `--skip-users`.
 
 ```sh
 rails g active_admin:install              # creates the AdminUser class
-rails g active_admin:install User         # uses an existing class
-rails g active_admin:install --skip-users # skips user authentication entirely
+rails g active_admin:install User         # creates / edits the class for use with Devise
+rails g active_admin:install --skip-users # skips Devise install
 ```
 
 The generator adds these core files, among others:
@@ -79,6 +82,11 @@ Kaminari.configure do |config|
 end
 ```
 
-[CHANGELOG]: https://github.com/gregbell/active_admin/blob/master/CHANGELOG.md
-[dashboard.rb]: https://github.com/gregbell/active_admin/blob/master/lib/generators/active_admin/install/templates/dashboard.rb
-[active_admin.rb]: https://github.com/gregbell/active_admin/blob/master/lib/generators/active_admin/install/templates/active_admin.rb.erb
+## simple_form
+
+If you're getting the error `wrong number of arguments (6 for 4..5)`, [read #2703].
+
+[CHANGELOG]: https://github.com/activeadmin/activeadmin/blob/master/CHANGELOG.md
+[dashboard.rb]: https://github.com/activeadmin/activeadmin/blob/master/lib/generators/active_admin/install/templates/dashboard.rb
+[active_admin.rb]: https://github.com/activeadmin/activeadmin/blob/master/lib/generators/active_admin/install/templates/active_admin.rb.erb
+[read #2703]: https://github.com/activeadmin/activeadmin/issues/2703#issuecomment-38140864