activeadmin 1.3.0 → 2.0.0.rc1

data/config/locales/en.yml

@@ -1,6 +1,22 @@
 en:
+  activerecord:
+    models:
+      comment:
+        one: "Comment"
+        other: "Comments"
+      active_admin/comment:
+        one: "Comment"
+        other: "Comments"
+    attributes:
+      active_admin/comment:
+        author_type: "Author type"
+        body: "Body"
+        created_at: "Created"
+        namespace: "Namespace"
+        resource_type: "Resource type"
+        updated_at: "Updated"
   active_admin:
-    dashboard: Dashboard
+    dashboard: "Dashboard"
     dashboard_welcome:
       welcome: "Welcome to Active Admin. This is the default dashboard page."
       call_to_action: "To add dashboard sections, checkout 'app/admin/dashboard.rb'"
@@ -37,6 +53,8 @@ en:
         lteq_datetime: "Lesser or equal to"
         from: "From"
         to: "To"
+    scopes:
+      all: "All"
     search_status:
       headline: "Search status:"
       current_scope: "Scope:"

data/config/locales/es.yml

@@ -1,6 +1,22 @@
 es:
+  activerecord:
+    models:
+      comment:
+        one: "Comentario"
+        other: "Comentarios"
+      active_admin/comment:
+        one: "Comentario"
+        other: "Comentarios"
+    attributes:
+      active_admin/comment:
+        namespace: "Espacio de nombres"
+        body: "Cuerpo"
+        resource_type: "Tipo de recurso"
+        author_type: "Tipo de autor"
+        created_at: "Fecha de creación"
+        updated_at: "Fecha de actualización"
   active_admin:
-    dashboard: Inicio
+    dashboard: "Inicio"
     dashboard_welcome:
       welcome: "Bienvenido a Active Admin. Esta es la página de inicio predeterminada."
       call_to_action: "Para agregar secciones edite 'app/admin/dashboard.rb'"
@@ -21,6 +37,7 @@ es:
     has_many_new: "Añadir %{model}"
     has_many_delete: "Eliminar"
     has_many_remove: "Quitar"
+    move: "Mover"
     filters:
       buttons:
         filter: "Filtrar"
@@ -36,6 +53,8 @@ es:
         lteq_datetime: "Menor o igual que"
         from: "Desde"
         to: "Hasta"
+    scopes:
+      all: "Todos"
     search_status:
       headline: "Estado de la búsqueda:"
       current_scope: "Alcance:"

data/config/locales/fi.yml

@@ -9,7 +9,7 @@ fi:
     delete: "Poista"
     delete_confirmation: "Oletko varma, että haluat poistaa tämän?"
     new_model: "Uusi %{model}"
-    edit_model: "Muokaa %{model}"
+    edit_model: "Muokkaa %{model}"
     delete_model: "Poista %{model}"
     details: "%{model} Tiedot"
     cancel: "Peruuta"

data/config/locales/he.yml

@@ -138,4 +138,3 @@ he:
       block: "רשימה"
       grid: "גריד"
       blog: "בלוג"
-

data/config/locales/hu.yml

@@ -31,6 +31,10 @@ hu:
         ends_with: "végződik"
         greater_than: "Nagyobb, mint"
         less_than: "Kisebb, mint"
+        gteq_datetime: "Nagyobb vagy egyenlő, mint"
+        lteq_datetime: "Kisebb vagy egyenlő, mint"
+        from: "-tól"
+        to: "-ig"
     status_tag:
       "yes": "Igen"
       "no": "Nem"

data/config/locales/it.yml

@@ -8,6 +8,7 @@ it:
     edit: "Modifica"
     delete: "Rimuovi"
     delete_confirmation: "Sei sicuro di volerlo rimuovere?"
+    create_another: "Crea un altro %{model}"
     new_model: "Aggiungi %{model}"
     edit_model: "Modifica %{model}"
     delete_model: "Rimuovi %{model}"
@@ -56,6 +57,7 @@ it:
       one_page: "Sto mostrando <b>%{n}</b> %{model}. Lista completa."
       multiple: "Sto mostrando %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> di <b>%{total}</b> in totale"
       multiple_without_total: "Sto mostrando %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b>"
+      per_page: "Oggetti per pagina: "
       entry:
         one: "voce"
         other: "voci"
@@ -100,6 +102,8 @@ it:
         title: "Sottodominio"
       password:
         title: "Password"
+      password_confirmation:
+        title: "Conferma password"
       sign_up:
         title: "Iscriviti"
         submit: "Iscriviti"

data/config/locales/lt.yml

@@ -53,8 +53,8 @@ lt:
       empty: '%{model} nerastas'
       one: 'Rodoma <B> 1 </ b> %{model}'
       one_page: 'Rodoma <b>visi %{n} </ b> %{model}'
-      multiple: 'Rodomi %{model} <b>%{iš}&nbsp;-&nbsp;%{to} </ b> iš<b>%{total} </ b> iš viso'
-      multiple_without_total: 'Rodomi %{model} <b>%{iš}&nbsp;-&nbsp;%{to} </ b> '
+      multiple: 'Rodomi %{model} <b>%{from}&nbsp;-&nbsp;%{to} </ b> iš<b>%{total} </ b> iš viso'
+      multiple_without_total: 'Rodomi %{model} <b>%{from}&nbsp;-&nbsp;%{to} </ b> '
       per_page: "Puslapyje: "
       entry:
         one: 'įrašas'

data/config/locales/nb.yml

@@ -31,6 +31,10 @@ nb:
         ends_with: "Slutter med"
         greater_than: "Større enn"
         less_than: "Mindre enn"
+        gteq_datetime: "Større enn eller lik"
+        lteq_datetime: "Mindre enn eller lik"
+        from: "Fra"
+        to: "Til"
     search_status:
       headline: "Søkestatus:"
       current_scope: "Søkeområde:"
@@ -70,11 +74,17 @@ nb:
       labels:
         destroy: "Slett"
     comments:
-      body: "Body"
-      author: "Author"
-      add: "Add Comment"
-      resource: "Resource"
-      no_comments_yet: "No comments yet."
+      created_at: "Opprettet"
+      resource_type: "Ressurstype"
+      author_type: "Forfattertype"
+      body: "Brødtekst"
+      author: "Forfatter"
+      add: "Legg til kommentar"
+      delete: "Slett kommentar"
+      delete_confirmation: "Er du sikker på at du ønsker å slette kommentaren?"
+      resource: "Ressurs"
+      no_comments_yet: "Ingen kommentarer ennå."
+      author_missing: "Anonym"
       title_content: "Kommentarer (%{count})"
       errors:
         empty_text: "Kommentar ble ikke lagret, teksten var tom."

data/config/locales/nl.yml

@@ -8,6 +8,7 @@ nl:
     edit: "Wijzig"
     delete: "Verwijder"
     delete_confirmation: "Weet u zeker dat je dit item wilt verwijderen?"
+    create_another: "Maak nog een %{model}"
     new_model: "Nieuwe %{model}"
     edit_model: "Wijzig %{model}"
     delete_model: "Verwijder %{model}"
@@ -20,6 +21,7 @@ nl:
     has_many_new: "Voeg nieuwe %{model} toe"
     has_many_delete: "Verwijderen"
     has_many_remove: "Verwijderen"
+    move: "Verplaats"
     filters:
       buttons:
         filter: "Filter"
@@ -31,10 +33,15 @@ nl:
         ends_with: "Eindigt op"
         greater_than: "Groter dan"
         less_than: "Kleiner dan"
+        from: Van
+        gteq_datetime: Groter of gelijk aan
+        lteq_datetime: Kleiner of gelijk aan
+        to: Tot
     search_status:
       current_scope: "Scope:"
       current_filters: "Huidige filters:"
       no_current_filters: "Geen"
+      headline: "Zoek status"
     status_tag:
       "yes": "Ja"
       "no": "Geen"
@@ -43,6 +50,7 @@ nl:
     powered_by: "Mogelijk gemaakt door %{active_admin} %{version}"
     sidebars:
       filters: "Filters"
+      search_status: "Zoek status"
     pagination:
       empty: "Geen %{model} gevonden"
       one: "Geeft <b>1</b> %{model} weer"
@@ -52,6 +60,7 @@ nl:
       entry:
         one: "entry"
         other: "entries"
+      per_page: "Per pagina: "
     any: "Alle"
     blank_slate:
       content: "Er zijn geen %{resource_name} gevonden."
@@ -93,6 +102,8 @@ nl:
         title: "Subdomein"
       password:
         title: "Wachtwoord"
+      password_confirmation:
+        title: "Bevestig password"
       sign_up:
         title: "Registreren"
         submit: "Registreren"

data/config/locales/pl.yml

@@ -1,4 +1,24 @@
 pl:
+  activerecord:
+    models:
+      comment:
+        one: "Komentarz"
+        few: "Komentarze"
+        many: "Komentarzy"
+        other: "Komentarze"
+      active_admin/comment:
+        one: "Komentarz"
+        few: "Komentarze"
+        many: "Komentarzy"
+        other: "Komentarze"
+    attributes:
+      active_admin/comment:
+        author_type: "Typ autora"
+        body: "Treść"
+        created_at: "Utworzony"
+        namespace: "Namespace"
+        resource_type: "Typ zasobu"
+        updated_at: "Zaktualizowany"
   active_admin:
     dashboard: Pulpit
     dashboard_welcome:
@@ -8,10 +28,11 @@ pl:
     edit: "Edytuj"
     delete: "Usuń"
     delete_confirmation: "Jesteś pewien, że chcesz to usunąć?"
+    create_another: "Utwórz kolejny %{model}"
     new_model: "Nowy %{model}"
     edit_model: "Edytuj %{model}"
     delete_model: "Usuń %{model}"
-    details: "Detale %{model}"
+    details: "Szczegóły %{model}"
     cancel: "Anuluj"
     empty: "Pusty"
     previous: "Poprzednia"
@@ -20,6 +41,7 @@ pl:
     has_many_new: "Dodaj nowy %{model}"
     has_many_delete: "Usuń"
     has_many_remove: "Usuń"
+    move: "Przenieś"
     filters:
       buttons:
         filter: "Filtruj"
@@ -31,6 +53,17 @@ pl:
         ends_with: "Kończy się"
         greater_than: "Większe niż"
         less_than: "Mniejsze niż"
+        gteq_datetime: "Większe lub równe"
+        lteq_datetime: "Mniejsze lub równe"
+        from: "Od"
+        to: "Do"
+    scopes:
+      all: "Wszystko"
+    search_status:
+      headline: "Status wyszukiwania:"
+      current_scope: "Aktywny zakres:"
+      current_filters: "Aktywne filtry:"
+      no_current_filters: "Brak"
     status_tag:
       "yes": "Tak"
       "no": "Nie"
@@ -39,12 +72,14 @@ pl:
     powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "Filtry"
+      search_status: "Status wyszukiwania"
     pagination:
       empty: "Nie znaleziono %{model}"
       one: "Wyświetlanie <b>1</b> %{model}"
       one_page: "Wyświetlanie <b>wszystkich %{n}</b> %{model}"
       multiple: "Wyświetlanie %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> z <b>%{total}</b>"
       multiple_without_total: "Wyświetlanie %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b>"
+      per_page: "Na stronę: "
       entry:
         one:
         other:
@@ -68,15 +103,31 @@ pl:
       labels:
         destroy: "Usuń"
     comments:
+      created_at: "Utworzony"
+      resource_type: "Typ zasobu"
+      author_type: "Typ autora"
       body: "Treść"
       author: "Autor"
       add: "Dodaj komentarz"
+      delete: "Usuń komentarz"
+      delete_confirmation: "Czy na pewno chcesz usunąć ten komentarz?"
       resource: "Zasób"
       no_comments_yet: "Nie ma jeszcze komentarzy."
+      author_missing: "Anonim"
       title_content: "Komentarze (%{count})"
       errors:
         empty_text: "Komentarz nie został zapisany, zawartość była pusta."
     devise:
+      username:
+        title: "Nazwa użytkownika"
+      email:
+        title: "Email"
+      subdomain:
+        title: "Subdomena"
+      password:
+        title: "Hasło"
+      password_confirmation:
+        title: "Powtórz hasło"
       sign_up:
         title: "Rejestracja"
         submit: "Zarejestruj się"
@@ -90,10 +141,27 @@ pl:
       change_password:
         title: "Zmień hasło"
         submit: "Zmień hasło"
+      unlock:
+        title: "Ponownie wyślij instrukcję odblokowania konta"
+        submit: "Ponownie wyślij instrukcję odblokowania konta"
       resend_confirmation_instructions:
-        title: "Wyślij ponownie instrukcje aktywacji"
-        submit: "Wyślij ponownie instrukcje aktywacji"
+        title: "Ponownie wyślij instrukcje aktywacji"
+        submit: "Ponownie wyślij instrukcje aktywacji"
       links:
+        sign_up: "Zarejestruj się"
         sign_in: "Zaloguj się"
         forgot_your_password: "Nie pamiętasz hasła?"
         sign_in_with_omniauth_provider: "Zaloguj się z %{provider}"
+        resend_unlock_instructions: "Ponownie wyślij instrukcję odblokowania konta"
+        resend_confirmation_instructions: "Ponownie wyślij instrukcje aktywacji"
+    unsupported_browser:
+      headline: "ActiveAdmin nie wspiera przeglądarki Internet Explorer w wersjach 8 i niższych."
+      recommendation: "Polecamy <a href=\"http://browsehappy.com/\">aktualizację przeglądarki</a>."
+      turn_off_compatibility_view: "Jeśli używasz Internet Explorera w wersji 9 lub nowszej, upewnij się, że <a href=\"https://support.microsoft.com/en-us/help/17471\">\"tryb zgodności\" został wyłączony.</a>."
+    access_denied:
+      message: "Nie masz uprawnień wystarczających do wykonania tej akcji."
+    index_list:
+      table: "Tabela"
+      block: "Lista"
+      grid: "Siatka"
+      blog: "Blog"

data/config/locales/ru.yml

@@ -31,6 +31,8 @@ ru:
         ends_with: "Заканчивается"
         greater_than: "больше"
         less_than: "меньше"
+        from: "От"
+        to: "До"
     search_status:
       headline: "Статус поиска:"
       current_scope: "Область:"

data/config/locales/tr.yml

@@ -8,6 +8,7 @@ tr:
     edit: "Düzenle"
     delete: "Sil"
     delete_confirmation: "Bu kaydı silmek istediğinizden emin misiniz?"
+    create_another: "Başka bir %{model} oluştur"
     new_model: "Yeni %{model}"
     edit_model: "%{model} Kaydını Düzenle"
     delete_model: "%{model} Kaydını Sil"
@@ -20,6 +21,7 @@ tr:
     has_many_new: "Yeni %{model} Ekle"
     has_many_delete: "Sil"
     has_many_remove: "Çıkar"
+    move: "Taşı"
     filters:
       buttons:
         filter: "Filtrele"
@@ -31,6 +33,10 @@ tr:
         ends_with: "İle biter"
         greater_than: "Büyüktür"
         less_than: "Küçüktür"
+        gteq_datetime: "Büyük yada eşit"
+        lteq_datetime: "Küçük yada eşit"
+        from: "Başlangıç"
+        to: "Bitiş"
     search_status:
       headline: "Arama"
       current_scope: "Kapsam:"
@@ -51,6 +57,7 @@ tr:
       one_page: "<b>%{n}</b> %{model} kaydının tamamı görüntüleniyor"
       multiple: "<b>%{from}&nbsp;-&nbsp;%{to}</b> arası %{model} görüntüleniyor (toplam %{total} kayıt)"
       multiple_without_total: "<b>%{from}&nbsp;-&nbsp;%{to}</b> arası %{model} görüntüleniyor"
+      per_page: "Sayfa Başına: "
       entry:
         one: "kayıt"
         other: "kayıtlar"
@@ -95,6 +102,8 @@ tr:
         title: "Alt alan adı"
       password:
         title: "Şifre"
+      password_confirmation:
+        title: "Şifreyi Tekrarla"
       sign_up:
         title: "Kaydol"
         submit: "Kaydol"

data/config/locales/uk.yml

@@ -31,6 +31,8 @@ uk:
         ends_with: "Закінчується"
         greater_than: "більше"
         less_than: "менше"
+        from: "від"
+        to: "до"
     search_status:
       headline: "Статус пошуку:"
       current_scope: "Область:"

data/config/locales/zh-CN.yml

@@ -8,12 +8,13 @@
     edit: "编辑"
     delete: "删除"
     delete_confirmation: "确定删除?"
+    create_another: "新建另一个%{model}"
     new_model: "新建%{model}"
     edit_model: "编辑%{model}"
     delete_model: "删除%{model}"
     details: "%{model}详情"
     cancel: "取消"
-    empty: "清空"
+    empty: "未定义"
     previous: "上一个"
     next: "下一个"
     download: "下载:"
@@ -31,14 +32,18 @@
         ends_with: "完与"
         greater_than: "大于"
         less_than: "小于"
+        gteq_datetime: "大于等于"
+        lteq_datetime: "小于等于"
+        from: "起"
+        to: "止"
     search_status:
       headline: "搜索条件："
       current_scope: "搜索范围："
       current_filters: "过滤条件："
       no_current_filters: "无"
     status_tag:
-      "yes": "是的"
-      "no": "无"
+      "yes": "是"
+      "no": "否"
     main_content: "请执行 %{model}#main_content 来显示内容."
     logout: "退出"
     powered_by: "Powered by %{active_admin} %{version}"
@@ -51,6 +56,7 @@
       one_page: "显示 <b>所有 %{n}</b> %{model}"
       multiple: "显示所有 <b>%{total}</b> %{model}中的<b>%{from}&nbsp;-&nbsp;%{to}</b> 条"
       multiple_without_total: "%{model}中的<b>%{from}&nbsp;-&nbsp;%{to}</b> 条"
+      per_page: "每页："
       entry:
         one: "条目"
         other: "条目"
@@ -63,7 +69,7 @@
     batch_actions:
       button_label: "批处理"
       default_confirmation: "你确定你要这样做？"
-      delete_confirmation: "你确定要删除所有%{plural_model}?"
+      delete_confirmation: "你确定要删除这些%{plural_model}?"
       succesfully_destroyed:
         one: "成功删除 1 %{model}"
         other: "成功删除 %{count} %{plural_model}"
@@ -72,11 +78,17 @@
       labels:
         destroy: "删除"
     comments:
+      created_at: "创建于"
+      resource_type: "资源类型"
+      author_type: "作者类型"
       body: "内容"
       author: "作者"
       add: "添加评论"
+      delete: "删除评论"
+      delete_confirmation: "你确定删除这些评论？"
       resource: "资源"
       no_comments_yet: "暂时没有评论"
+      author_missing: "匿名"
       title_content: "(%{count})条评论"
       errors:
         empty_text: "评论保存失败，内空不能为空."
@@ -89,6 +101,11 @@
         title: "子域"
       password:
         title: "密码"
+      password_confirmation:
+        title: "确认密码"
+      sign_up:
+        title: "注册"
+        submit: "注册"
       login:
         title: "登录"
         remember_me: "记住我"
@@ -96,6 +113,9 @@
       reset_password:
         title: "忘记了密码？"
         submit: "重置我的密码"
+      change_password:
+        title: "修改密码"
+        submit: "修改密码"
       unlock:
         title: "重新发送送解锁命令"
         submit: "重新发送送解锁命令"
@@ -103,12 +123,20 @@
         title: " 重新发送确认指示"
         submit: " 重新发送确认指示"
       links:
+        sign_up: "注册"
         sign_in: "登录"
         forgot_your_password: "忘记了密码？"
-        sign_in_with_omniauth_provider: "登入%{provider}"
+        sign_in_with_omniauth_provider: "通过%{provider}登录"
+        resend_unlock_instructions: "重发解锁邮件"
+        resend_confirmation_instructions: "重发确认邮件"
     unsupported_browser:
       headline: "很抱歉，ActiveAdmin 已不再支持 Internet Explorer 8 以下版本的浏览器。"
       recommendation: "建议您升级到最新版本的<a href=\"http://windows.microsoft.com/ie\">Internet Explorer</a>，<a href=\"https://chrome.google.com/\">Google Chrome</a>，或是 <a href=\"https://mozilla.org/firefox/\">Firefox</a>。"
       turn_off_compatibility_view: "如果您使用的是 IE 9 或更新的版本，请确认<a href=\"https://support.microsoft.com/zh-cn/help/17472/windows-internet-explorer-11-fix-site-display-problems-compatibility-view\">已关闭“兼容性视图”</a>。"
     access_denied:
       message: "您无权处理此操作"
+    index_list:
+      table: "表格"
+      block: "列表"
+      grid: "网格"
+      blog: "博客"

data/docs/.gitignore

@@ -0,0 +1 @@
+_site/

data/docs/0-installation.md

@@ -11,7 +11,7 @@ gem 'activeadmin'
 
 # Plus integrations with:
 gem 'devise'
-gem 'cancan' # or cancancan
+gem 'cancancan'
 gem 'draper'
 gem 'pundit'
 ```
@@ -44,7 +44,7 @@ After installing the gem, you need to run the generator. Here are your options:
 The generator adds these core files, among others:
 
 * `app/admin/dashboard.rb`
-* `app/assets/javascripts/active_admin.js.coffee`
+* `app/assets/javascripts/active_admin.js`
 * `app/assets/stylesheets/active_admin.scss`
 * `config/initializers/active_admin.rb`
 

data/docs/1-general-configuration.md

@@ -46,13 +46,22 @@ config.site_title_image = ->(context) { context.current_user.company.logo_url }
 
 ## Internationalization (I18n)
 
+Active Admin comes with translations for a lot of
+[locales](https://github.com/activeadmin/activeadmin/blob/master/config/locales/).
+Active Admin does not provide the translations for the kaminari gem it uses for pagination,
+to get these you can use the
+[kaminari-i18n](https://github.com/tigrish/kaminari-i18n) gem.
+
 To translate Active Admin to a new language or customize an existing
 translation, you can copy
 [config/locales/en.yml](https://github.com/activeadmin/activeadmin/blob/master/config/locales/en.yml)
 to your application's `config/locales` folder and update it. We welcome
 new/updated translations, so feel free to
 [contribute](https://github.com/activeadmin/activeadmin/blob/master/CONTRIBUTING.md)!
-To translate third party gems like devise, use for example devise-i18n.
+
+When using [devise](https://github.com/plataformatec/devise) for authentication,
+you can use the [devise-i18n](https://github.com/tigrish/devise-i18n)
+gem to get the devise translations for other locales.
 
 ## Localize Format For Dates and Times
 
@@ -160,6 +169,12 @@ You can customize the comment menu:
 config.comments_menu = { parent: 'Admin', priority: 1 }
 ```
 
+Remember to indicate where to place the comments and form with:
+
+```ruby
+active_admin_comments
+```
+
 ## Utility Navigation
 
 The "utility navigation" shown at the top right normally shows the current user

data/docs/10-custom-pages.md

@@ -134,3 +134,17 @@ end
 ```
 
 See also the [Custom Actions](8-custom-actions.md#http-verbs) example.
+
+## Use custom column as id
+
+You can use custom parameter instead of id
+
+```ruby
+ActiveAdmin.register User do
+  controller do
+    defaults :finder => :find_by_name
+  end
+end
+```
+
+This defines the resource route as `/admin/users/john` if user name is john

data/docs/12-arbre-components.md

@@ -115,6 +115,21 @@ end
 In the above example, the first column will not grow larger than 200px and will
 not shrink less than 100px.
 
+### Custom Column Class
+
+Pass the `:class` option to the column method to set a custom class.
+
+```ruby
+columns do
+  column class: "important" do
+    span "Column # 1"
+  end
+  column do
+    span "Column # 2"
+  end
+end
+```
+
 ## Table For
 
 Table For provides the ability to create tables like those present
@@ -130,10 +145,22 @@ table_for order.payments do
 end
 ```
 
-the `column` method can take a title as its first argument and data
+The `column` method can take a title as its first argument and data
 (`:your_method`) as its second (or first if no title provided). Column also
 takes a block.
 
+### Internationalization
+
+To customize the internationalization for the component, specify a resource to
+use for translations via the `i18n` named parameter. This is only necessary for
+non-`ActiveRecord::Relation` collections:
+
+```ruby
+table_for payments, i18n: Payment do
+  # ...
+end
+```
+
 ## Status tag
 
 Status tags provide convenient syntactic sugar for styling items that have