activeadmin 1.0.0.pre1 → 1.0.0.pre2

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of activeadmin might be problematic. Click here for more details.

Files changed (167) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +18 -16
  3. data/CHANGELOG.md +18 -1013
  4. data/Gemfile +18 -11
  5. data/LICENSE +0 -5
  6. data/README.md +0 -2
  7. data/activeadmin.gemspec +3 -1
  8. data/app/assets/javascripts/active_admin/application.js.coffee +8 -3
  9. data/app/assets/javascripts/active_admin/base.js.coffee +1 -6
  10. data/app/assets/javascripts/active_admin/jquery_ui.js.erb +11 -0
  11. data/app/assets/javascripts/active_admin/lib/flash.js.coffee +1 -1
  12. data/app/assets/javascripts/active_admin/lib/modal_dialog.js.coffee +11 -3
  13. data/app/assets/javascripts/active_admin/lib/per_page.js.coffee +5 -1
  14. data/app/assets/stylesheets/active_admin/_base.scss +1 -4
  15. data/app/assets/stylesheets/active_admin/_forms.scss +13 -8
  16. data/app/assets/stylesheets/active_admin/components/_buttons.scss +0 -5
  17. data/app/assets/stylesheets/active_admin/mixins/_all.scss +0 -1
  18. data/app/assets/stylesheets/active_admin/mixins/_sections.scss +0 -1
  19. data/app/assets/stylesheets/active_admin/mixins/_typography.scss +1 -1
  20. data/app/assets/stylesheets/active_admin/mixins/_variables.scss +1 -1
  21. data/app/assets/stylesheets/active_admin/structure/_title_bar.scss +0 -5
  22. data/app/views/layouts/active_admin_logged_out.html.erb +4 -0
  23. data/config/locales/ar.yml +14 -2
  24. data/config/locales/de-CH.yml +2 -0
  25. data/config/locales/de.yml +15 -0
  26. data/config/locales/en.yml +10 -2
  27. data/config/locales/es.yml +26 -4
  28. data/config/locales/fr.yml +5 -0
  29. data/config/locales/id.yml +135 -0
  30. data/config/locales/ja.yml +21 -3
  31. data/config/locales/ko.yml +66 -36
  32. data/config/locales/nl.yml +14 -1
  33. data/config/locales/pt-BR.yml +11 -0
  34. data/config/locales/ru.yml +15 -1
  35. data/config/locales/sv-SE.yml +45 -5
  36. data/config/locales/uk.yml +16 -4
  37. data/config/locales/zh-CN.yml +5 -0
  38. data/config/locales/zh-TW.yml +32 -1
  39. data/docs/0-installation.md +7 -1
  40. data/docs/1-general-configuration.md +9 -0
  41. data/docs/10-custom-pages.md +10 -0
  42. data/docs/12-arbre-components.md +1 -1
  43. data/docs/14-gotchas.md +2 -2
  44. data/docs/2-resource-customization.md +5 -3
  45. data/docs/3-index-pages.md +7 -0
  46. data/docs/3-index-pages/index-as-table.md +4 -0
  47. data/docs/6-show-pages.md +1 -1
  48. data/docs/7-sidebars.md +8 -0
  49. data/features/index/batch_actions.feature +21 -2
  50. data/features/index/pagination.feature +16 -12
  51. data/features/meta_tags.feature +21 -0
  52. data/features/registering_assets.feature +1 -2
  53. data/features/show/columns.feature +40 -0
  54. data/features/show/default_content.feature +2 -1
  55. data/features/step_definitions/asset_steps.rb +3 -3
  56. data/features/step_definitions/batch_action_steps.rb +11 -2
  57. data/features/step_definitions/column_steps.rb +8 -0
  58. data/features/step_definitions/configuration_steps.rb +2 -2
  59. data/features/step_definitions/factory_steps.rb +3 -2
  60. data/features/step_definitions/meta_tag_steps.rb +3 -0
  61. data/features/step_definitions/pagination_steps.rb +8 -0
  62. data/features/step_definitions/table_steps.rb +2 -1
  63. data/lib/active_admin.rb +3 -3
  64. data/lib/active_admin/application.rb +66 -16
  65. data/lib/active_admin/batch_actions.rb +0 -1
  66. data/lib/active_admin/batch_actions/controller.rb +2 -2
  67. data/lib/active_admin/batch_actions/resource_extension.rb +3 -1
  68. data/lib/active_admin/callbacks.rb +1 -1
  69. data/lib/active_admin/csv_builder.rb +2 -2
  70. data/lib/active_admin/dependency.rb +18 -16
  71. data/lib/active_admin/devise.rb +1 -1
  72. data/lib/active_admin/dsl.rb +1 -1
  73. data/lib/active_admin/event.rb +8 -17
  74. data/lib/active_admin/filters/active.rb +29 -0
  75. data/lib/active_admin/filters/forms.rb +6 -1
  76. data/lib/active_admin/filters/humanized.rb +68 -0
  77. data/lib/active_admin/filters/resource_extension.rb +48 -1
  78. data/lib/active_admin/form_builder.rb +4 -4
  79. data/lib/active_admin/generators/boilerplate.rb +37 -0
  80. data/lib/active_admin/helpers/routes/url_helpers.rb +1 -1
  81. data/lib/active_admin/inputs.rb +1 -0
  82. data/lib/active_admin/inputs/filters/date_picker_input.rb +13 -0
  83. data/lib/active_admin/inputs/filters/date_range_input.rb +1 -1
  84. data/lib/active_admin/menu.rb +1 -0
  85. data/lib/active_admin/menu_item.rb +1 -1
  86. data/lib/active_admin/namespace.rb +5 -5
  87. data/lib/active_admin/orm/active_record/comments.rb +10 -1
  88. data/lib/active_admin/orm/active_record/comments/comment.rb +1 -1
  89. data/lib/active_admin/orm/active_record/comments/views/active_admin_comments.rb +11 -0
  90. data/lib/active_admin/resource.rb +9 -3
  91. data/lib/active_admin/resource/action_items.rb +13 -3
  92. data/lib/active_admin/resource/belongs_to.rb +6 -2
  93. data/lib/active_admin/resource/pagination.rb +4 -0
  94. data/lib/active_admin/resource_collection.rb +3 -1
  95. data/lib/active_admin/resource_controller/data_access.rb +6 -11
  96. data/lib/active_admin/resource_controller/decorators.rb +1 -1
  97. data/lib/active_admin/resource_dsl.rb +8 -2
  98. data/lib/active_admin/sidebar_section.rb +4 -12
  99. data/lib/active_admin/version.rb +1 -1
  100. data/lib/active_admin/view_factory.rb +1 -2
  101. data/lib/active_admin/view_helpers.rb +0 -1
  102. data/lib/active_admin/view_helpers/display_helper.rb +3 -4
  103. data/lib/active_admin/view_helpers/method_or_proc_helper.rb +3 -3
  104. data/lib/active_admin/views/components/active_admin_form.rb +3 -3
  105. data/lib/active_admin/views/components/columns.rb +9 -4
  106. data/lib/active_admin/views/components/dropdown_menu.rb +0 -2
  107. data/lib/active_admin/views/components/paginated_collection.rb +35 -13
  108. data/lib/active_admin/views/components/panel.rb +1 -3
  109. data/lib/active_admin/views/components/sidebar_section.rb +6 -1
  110. data/lib/active_admin/views/components/status_tag.rb +3 -2
  111. data/lib/active_admin/views/components/table_for.rb +2 -1
  112. data/lib/active_admin/views/index_as_table.rb +2 -2
  113. data/lib/active_admin/views/pages/base.rb +4 -0
  114. data/lib/active_admin/views/pages/show.rb +1 -1
  115. data/lib/generators/active_admin/assets/assets_generator.rb +1 -1
  116. data/lib/generators/active_admin/assets/templates/{active_admin.css.scss → active_admin.scss} +0 -0
  117. data/lib/generators/active_admin/devise/devise_generator.rb +7 -19
  118. data/lib/generators/active_admin/install/templates/active_admin.rb.erb +29 -0
  119. data/lib/generators/active_admin/page/templates/page.rb +1 -1
  120. data/lib/generators/active_admin/resource/resource_generator.rb +6 -0
  121. data/lib/generators/active_admin/resource/templates/admin.rb +34 -13
  122. data/spec/rails_helper.rb +6 -2
  123. data/spec/requests/memory_spec.rb +1 -3
  124. data/spec/support/active_admin_request_helpers.rb +27 -0
  125. data/spec/support/detect_rails_version.rb +1 -1
  126. data/spec/support/rails_template.rb +7 -0
  127. data/spec/unit/application_spec.rb +29 -4
  128. data/spec/unit/batch_actions/resource_spec.rb +5 -0
  129. data/spec/unit/belongs_to_spec.rb +14 -0
  130. data/spec/unit/comments_spec.rb +24 -2
  131. data/spec/unit/controller_filters_spec.rb +25 -28
  132. data/spec/unit/dsl_spec.rb +1 -1
  133. data/spec/unit/filters/humanized_spec.rb +56 -0
  134. data/spec/unit/filters/resource_spec.rb +1 -1
  135. data/spec/unit/form_builder_spec.rb +71 -11
  136. data/spec/unit/generators/install_spec.rb +3 -2
  137. data/spec/unit/pretty_format_spec.rb +15 -1
  138. data/spec/unit/resource_collection_spec.rb +17 -0
  139. data/spec/unit/resource_controller_spec.rb +2 -2
  140. data/spec/unit/resource_registration_spec.rb +3 -3
  141. data/spec/unit/resource_spec.rb +53 -2
  142. data/spec/unit/view_factory_spec.rb +0 -2
  143. data/spec/unit/view_helpers/display_name_spec.rb +6 -4
  144. data/spec/unit/views/components/{batch_action_popover_spec.rb → batch_action_selector_spec.rb} +9 -13
  145. data/spec/unit/views/components/columns_spec.rb +17 -0
  146. data/spec/unit/views/components/paginated_collection_spec.rb +16 -2
  147. data/spec/unit/views/components/panel_spec.rb +1 -5
  148. data/spec/unit/views/components/sidebar_section_spec.rb +21 -0
  149. data/spec/unit/views/components/status_tag_spec.rb +15 -1
  150. data/spec/unit/views/components/table_for_spec.rb +45 -0
  151. data/tasks/parallel_tests.rake +1 -1
  152. data/tasks/test.rake +4 -4
  153. metadata +29 -30
  154. data/app/assets/javascripts/active_admin/lib/popover.js.coffee +0 -68
  155. data/app/assets/stylesheets/active_admin/components/_popovers.scss +0 -122
  156. data/app/assets/stylesheets/active_admin/mixins/_icons.scss +0 -20
  157. data/lib/active_admin/batch_actions/views/batch_action_popover.rb +0 -28
  158. data/lib/active_admin/iconic.rb +0 -53
  159. data/lib/active_admin/iconic/icons.rb +0 -142
  160. data/lib/active_admin/view_helpers/icon_helper.rb +0 -12
  161. data/lib/active_admin/views/components/action_list_popover.rb +0 -29
  162. data/lib/active_admin/views/components/popover.rb +0 -27
  163. data/spec/javascripts/coffeescripts/jquery.aa.popover-spec.js.coffee +0 -82
  164. data/spec/support/integration_example_group.rb +0 -31
  165. data/spec/unit/event_spec.rb +0 -47
  166. data/spec/unit/views/components/action_list_popover_spec.rb +0 -40
  167. data/spec/unit/views/components/popover_spec.rb +0 -33
@@ -31,6 +31,10 @@ en:
31
31
  ends_with: "Ends with"
32
32
  greater_than: "Greater than"
33
33
  less_than: "Less than"
34
+ search_status:
35
+ headline: "Scope:"
36
+ current_filters: "Current filters:"
37
+ no_current_filters: "None"
34
38
  status_tag:
35
39
  "yes": "Yes"
36
40
  "no": "No"
@@ -39,6 +43,7 @@ en:
39
43
  powered_by: "Powered by %{active_admin} %{version}"
40
44
  sidebars:
41
45
  filters: "Filters"
46
+ search_status: "Search Status"
42
47
  pagination:
43
48
  empty: "No %{model} found"
44
49
  one: "Displaying <b>1</b> %{model}"
@@ -67,12 +72,15 @@ en:
67
72
  labels:
68
73
  destroy: "Delete"
69
74
  comments:
75
+ created_at: "Created"
70
76
  resource_type: "Resource Type"
71
77
  author_type: "Author Type"
72
78
  body: "Body"
73
79
  author: "Author"
74
80
  title: "Comment"
75
81
  add: "Add Comment"
82
+ delete: "Delete Comment"
83
+ delete_confirmation: "Are you sure you want to delete these comment?"
76
84
  resource: "Resource"
77
85
  no_comments_yet: "No comments yet."
78
86
  author_missing: "Anonymous"
@@ -112,8 +120,8 @@ en:
112
120
  sign_in: "Sign in"
113
121
  forgot_your_password: "Forgot your password?"
114
122
  sign_in_with_omniauth_provider: "Sign in with %{provider}"
115
- resend_unlock_instructions: "Re-send unlock instructions"
116
- resend_confirmation_instructions: "Re-send confirmation instructions"
123
+ resend_unlock_instructions: "Resend unlock instructions"
124
+ resend_confirmation_instructions: "Resend confirmation instructions"
117
125
  unsupported_browser:
118
126
  headline: "Please note that ActiveAdmin no longer supports Internet Explorer versions 8 or less."
119
127
  recommendation: "We recommend upgrading to the latest <a href=\"http://windows.microsoft.com/ie\">Internet Explorer</a>, <a href=\"https://chrome.google.com/\">Google Chrome</a>, or <a href=\"https://mozilla.org/firefox/\">Firefox</a>."
@@ -31,6 +31,10 @@ es:
31
31
  ends_with: "Termina con"
32
32
  greater_than: "Mayor que"
33
33
  less_than: "Menor que"
34
+ search_status:
35
+ headline: "Alcance:"
36
+ current_filters: "Filtros actuales:"
37
+ no_current_filters: "Ninguno"
34
38
  status_tag:
35
39
  "yes": "Sí"
36
40
  "no": "No"
@@ -39,6 +43,7 @@ es:
39
43
  powered_by: "Funciona con %{active_admin} %{version}"
40
44
  sidebars:
41
45
  filters: "Filtros"
46
+ search_status: "Estado de la búsqueda"
42
47
  pagination:
43
48
  empty: "No se han encontrado %{model}"
44
49
  one: "Mostrando <b>1</b> %{model}"
@@ -67,13 +72,16 @@ es:
67
72
  labels:
68
73
  destroy: "Borrar"
69
74
  comments:
75
+ created_at: "Fecha de creación"
76
+ resource_type: "Tipo de recurso"
77
+ author_type: "Tipo de autor"
70
78
  body: "Cuerpo"
71
79
  author: "Autor"
72
80
  title: "Comentario"
73
81
  add: "Comentar"
82
+ delete: "Borrar Comentario"
83
+ delete_confirmation: "¿Está seguro que desea borrar este comentario?"
74
84
  resource: "Recurso"
75
- no_comments_yet: "Aún sin comentarios."
76
- title_content: "Comentarios (%{count})"
77
85
  no_comments_yet: "No hay comentarios aún."
78
86
  author_missing: "Anónimo"
79
87
  title_content: "Comentarios (%{count})"
@@ -105,9 +113,23 @@ es:
105
113
  title: "Reenviar instrucciones de desbloqueo"
106
114
  submit: "Reenviar instrucciones de desbloqueo"
107
115
  resend_confirmation_instructions:
108
- title: "Reenviar instrucciones de confirmación"
109
- submit: "Reenviar instrucciones de confirmación"
116
+ title: "Reenviar instrucciones de confirmación"
117
+ submit: "Reenviar instrucciones de confirmación"
110
118
  links:
119
+ sign_up: "Ingresar"
111
120
  sign_in: "registrarse"
112
121
  forgot_your_password: "¿Olvidó su contraseña?"
113
122
  sign_in_with_omniauth_provider: "Conéctate con %{provider}"
123
+ resend_unlock_instructions: "Reenviar instrucciones de desbloqueo"
124
+ resend_confirmation_instructions: "Reenviar instrucciones de confirmación"
125
+ unsupported_browser:
126
+ headline: "Por favor tenga en cuenta que Active Admin no soporta versiones de Internet Explorer menores a 8."
127
+ recommendation: "Recomendamos que actualice a la última versión de <a href=\"http://windows.microsoft.com/ie\">Internet Explorer</a>, <a href=\"https://chrome.google.com/\">Google Chrome</a>, o <a href=\"https://mozilla.org/firefox/\">Firefox</a>."
128
+ turn_off_compatibility_view: "Si está usando IE 9 o superior, asegúrese de <a href=\"http://windows.microsoft.com/es-es/windows7/webpages-look-incorrect-in-Internet-Explorer\">apagar la \"Vista de compatibilidad\"</a>."
129
+ access_denied:
130
+ message: "No está autorizado/a a realizar esta acción."
131
+ index_list:
132
+ table: "Tabla"
133
+ block: "Lista"
134
+ grid: "Grilla"
135
+ blog: "Blog"
@@ -31,6 +31,10 @@ fr:
31
31
  ends_with: "Se termine par"
32
32
  greater_than: "Plus grand que"
33
33
  less_than: "Plus petit que"
34
+ search_status:
35
+ headline: "Etendu du filtre :"
36
+ current_filters: "Filtres actuels :"
37
+ no_current_filters: "Aucun filtres"
34
38
  status_tag:
35
39
  "yes": "Oui"
36
40
  "no": "Non"
@@ -39,6 +43,7 @@ fr:
39
43
  powered_by: "Propulsé par %{active_admin} %{version}"
40
44
  sidebars:
41
45
  filters: "Filtres"
46
+ search_status: "Statut de la recherche"
42
47
  pagination:
43
48
  empty: "Aucun %{model} trouvé"
44
49
  one: "Affichage de <b>1</b> %{model}"
@@ -0,0 +1,135 @@
1
+ id:
2
+ active_admin:
3
+ dashboard: Dashboard
4
+ dashboard_welcome:
5
+ welcome: "Selamat datang di Active Admin. Ini adalah tampilan standar halaman dashboard."
6
+ call_to_action: "Tampilan halaman ini bisa diubah di file 'app/admin/dashboard.rb'"
7
+ view: "Lihat"
8
+ edit: "Ubah"
9
+ delete: "Hapus"
10
+ delete_confirmation: "Apakah anda yakin ingin menghapus data ini?"
11
+ new_model: "Tambah %{model} baru"
12
+ edit_model: "Ubah %{model}"
13
+ delete_model: "Hapus %{model}"
14
+ details: "Detail %{model}"
15
+ cancel: "Batal"
16
+ empty: "Kosong"
17
+ previous: "Sebelumnya"
18
+ next: "Berikutnya"
19
+ download: "Unduh:"
20
+ has_many_new: "Tambah %{model} baru"
21
+ has_many_delete: "Hapus"
22
+ has_many_remove: "Hapus"
23
+ filters:
24
+ buttons:
25
+ filter: "Filter"
26
+ clear: "Hapus Filters"
27
+ predicates:
28
+ contains: "Mengandung"
29
+ equals: "Sama dengan"
30
+ starts_with: "Diawali dengan"
31
+ ends_with: "Diakhiri dengan"
32
+ greater_than: "Lebih besar dari"
33
+ less_than: "Lebih kecil dari"
34
+ search_status:
35
+ headline: "Scope:"
36
+ current_filters: "Filter kini:"
37
+ no_current_filters: "Tidak ada"
38
+ status_tag:
39
+ "yes": "Ya"
40
+ "no": "Tidak"
41
+ main_content: "Harap mengimplementasikan %{model}#main_content untuk menampilkan konten."
42
+ logout: "Keluar"
43
+ powered_by: "Dibuat dengan %{active_admin} %{version}"
44
+ sidebars:
45
+ filters: "Filter"
46
+ search_status: "Status Pencarian"
47
+ pagination:
48
+ empty: "Tidak ada %{model} yang bisa ditemukan"
49
+ one: "Menampilkan <b>1</b> %{model}"
50
+ one_page: "Menampilkan <b>semua %{n}</b> %{model}"
51
+ multiple: "Menampilkan <b>%{from}&nbsp;-&nbsp;%{to}</b> dari <b>%{total}</b> keseluruhan %{model}"
52
+ multiple_without_total: "Menampilkan <b>%{from}&nbsp;-&nbsp;%{to} %{model}</b>"
53
+ entry:
54
+ one: "data"
55
+ other: "data"
56
+ any: "Apapun"
57
+ blank_slate:
58
+ content: "%{resource_name} masih belum ada sama sekali."
59
+ link: "Tambah data"
60
+ dropdown_actions:
61
+ button_label: "Tindakan"
62
+ batch_actions:
63
+ button_label: "Tindakan Serentak"
64
+ default_confirmation: "Apakah anda yakin akan melakukan ini?"
65
+ delete_confirmation: "Apakah anda yakin akan menghapus %{plural_model}?"
66
+ succesfully_destroyed:
67
+ one: "Berhasil menghapus %{model}"
68
+ other: "Berhasil menghapus %{count} %{plural_model}"
69
+ selection_toggle_explanation: "(Tampilkan Pilihan)"
70
+ link: "Tambah data"
71
+ action_label: "%{title} terpilih"
72
+ labels:
73
+ destroy: "Hapus"
74
+ comments:
75
+ created_at: "Dibuat"
76
+ resource_type: "Jenis Resource"
77
+ author_type: "Tipe Penulis"
78
+ body: "Isi"
79
+ author: "Penulis"
80
+ title: "Komentar"
81
+ add: "Tambah Komentar"
82
+ delete: "Hapus Komentar"
83
+ delete_confirmation: "Apakah anda yakin akan menghapus komentar tersebut?"
84
+ resource: "Resource"
85
+ no_comments_yet: "Belum ada komentar sama sekali."
86
+ author_missing: "Anonim"
87
+ title_content: "Komentar (%{count})"
88
+ errors:
89
+ empty_text: "Komentar tak bisa disimpan, text tidak boleh dikosongi."
90
+ devise:
91
+ username:
92
+ title: "Username"
93
+ email:
94
+ title: "Email"
95
+ subdomain:
96
+ title: "Subdomain"
97
+ password:
98
+ title: "Password"
99
+ sign_up:
100
+ title: " - Daftar"
101
+ submit: "Daftar"
102
+ login:
103
+ title: " - Masuk"
104
+ remember_me: "Ingat saya"
105
+ submit: "Masuk"
106
+ reset_password:
107
+ title: " - Form Atur Ulang Password"
108
+ submit: "Atur ulang password"
109
+ change_password:
110
+ title: " - Atur Ulang Password"
111
+ submit: "Kirimkan instruksi pengaturan ulang password"
112
+ unlock:
113
+ title: " - Kirim Instruksi Pengaktifan Kembali Akun"
114
+ submit: "Kirimkan instruksi pengaktifan kembali akun"
115
+ resend_confirmation_instructions:
116
+ title: " - Kirim Lagi Instruksi Konfirmasi Akun"
117
+ submit: "Kirimkan lagi instruksi konfirmasi akun"
118
+ links:
119
+ sign_up: "Daftar"
120
+ sign_in: "Masuk"
121
+ forgot_your_password: "Lupa password?"
122
+ sign_in_with_omniauth_provider: "Daftar melalui %{provider}"
123
+ resend_unlock_instructions: "Kirim instruksi pengaktifan kembali akun"
124
+ resend_confirmation_instructions: "Kirim lagi instruksi konfirmasi akun"
125
+ unsupported_browser:
126
+ headline: "Harap dicatat bahwa ActiveAdmin sudah tidak mendukung InternetExplorer versi 8 atau versi sebelum itu."
127
+ recommendation: "Kami sarankan agar anda mengupgrade ke versi <a href=\"http://windows.microsoft.com/ie\">Internet Explorer</a>, <a href=\"https://chrome.google.com/\">Google Chrome</a>, atau <a href=\"https://mozilla.org/firefox/\">Firefox</a> yang terbaru."
128
+ turn_off_compatibility_view: "Kalau anda menggunakan IE 9 atau yang lebih baru, pastikan anda <a href=\"http://windows.microsoft.com/en-US/windows7/webpages-look-incorrect-in-Internet-Explorer\">mematikan \"Compatibility View\"</a>."
129
+ access_denied:
130
+ message: "Anda tidak diperkenankan melakukan aksi tersebut."
131
+ index_list:
132
+ table: "Tabel"
133
+ block: "Daftar"
134
+ grid: "Grid"
135
+ blog: "Blog"
@@ -7,7 +7,7 @@ ja:
7
7
  view: "閲覧"
8
8
  edit: "編集"
9
9
  delete: "削除"
10
- delete_confirmation: "本当に削除しますか?"
10
+ delete_confirmation: "本当に削除しますか?"
11
11
  new_model: "%{model} を作成する"
12
12
  edit_model: "%{model} を編集する"
13
13
  delete_model: "%{model} を削除する"
@@ -31,6 +31,10 @@ ja:
31
31
  ends_with: "で終わる"
32
32
  greater_than: "より大きい"
33
33
  less_than: "より小さい"
34
+ search_status:
35
+ headline: "範囲:"
36
+ current_filters: "現在の絞り込み:"
37
+ no_current_filters: "なし"
34
38
  status_tag:
35
39
  "yes": "はい"
36
40
  "no": "いいえ"
@@ -39,6 +43,7 @@ ja:
39
43
  powered_by: "Powered by %{active_admin} %{version}"
40
44
  sidebars:
41
45
  filters: "検索条件"
46
+ search_status: "検索状態"
42
47
  pagination:
43
48
  empty: "%{model} は見つかりませんでした"
44
49
  one: "<b>1</b> 件の %{model} を表示しています"
@@ -56,8 +61,8 @@ ja:
56
61
  button_label: "操作"
57
62
  batch_actions:
58
63
  button_label: "一括操作"
59
- default_confirmation: "本当によろしいですか。"
60
- delete_confirmation: "%{plural_model} を削除してもよろしいですか?"
64
+ default_confirmation: "本当によろしいですか?"
65
+ delete_confirmation: "%{plural_model} を削除してもよろしいですか?"
61
66
  succesfully_destroyed:
62
67
  one: "1件の %{model} を削除しました"
63
68
  other: "%{count}件の %{plural_model} を削除しました"
@@ -67,12 +72,15 @@ ja:
67
72
  labels:
68
73
  destroy: "削除する"
69
74
  comments:
75
+ created_at: "作成日"
70
76
  resource_type: "リソース種別"
71
77
  author_type: "作成者種別"
72
78
  body: "本文"
73
79
  author: "作成者"
74
80
  title: "コメント"
75
81
  add: "コメントを追加"
82
+ delete: "コメントを削除"
83
+ delete_confirmation: "本当にコメントを削除しますか?"
76
84
  resource: "リソース"
77
85
  no_comments_yet: "コメントはまだありません。"
78
86
  author_missing: "匿名ユーザ"
@@ -88,6 +96,9 @@ ja:
88
96
  title: "サブドメイン"
89
97
  password:
90
98
  title: "パスワード"
99
+ sign_up:
100
+ title: "登録"
101
+ submit: "登録"
91
102
  login:
92
103
  title: "ログイン"
93
104
  remember_me: "次回から自動的にログイン"
@@ -101,6 +112,9 @@ ja:
101
112
  unlock:
102
113
  title: "ロックの解除方法を送る"
103
114
  submit: "ロックの解除方法を送る"
115
+ resend_confirmation_instructions:
116
+ title: "確認方法を再送信する"
117
+ submit: "確認方法を再送信する"
104
118
  links:
105
119
  sign_in: "サインイン"
106
120
  sign_up: "ユーザ登録"
@@ -108,6 +122,10 @@ ja:
108
122
  sign_in_with_omniauth_provider: "%{provider}のアカウントを使ってログイン"
109
123
  resend_confirmation_instructions: "ユーザ確認手順を再送する"
110
124
  resend_unlock_instructions: "ロックの解除方法を再送する"
125
+ unsupported_browser:
126
+ headline: "ActiveAdminは、Internet Explorer 8以下はサポートはしていません。"
127
+ 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>を使うことを推奨します。"
128
+ turn_off_compatibility_view: "Internet Explorer 9以降を使っている場合、<a href=\"http://windows.microsoft.com/ja-JP/windows7/webpages-look-incorrect-in-Internet-Explorer\">互換表示をオフ</a>にしてください。"
111
129
  access_denied:
112
130
  message: "アクションを実行する権限がありません"
113
131
  index_list:
@@ -2,18 +2,18 @@ ko:
2
2
  active_admin:
3
3
  dashboard: "대시보드"
4
4
  dashboard_welcome:
5
- welcome: "Active Admin 에 오신 것을 환영합니다. 이것은 디폴트 대시보드 페이지 입니다."
6
- call_to_action: "대시보드에 섹션을 추가하시려면 'app/admin/dashboard.rb' 소스를 확인해 주세요."
5
+ welcome: "ActiveAdmin에 오신 것을 환영합니다. 기본 대시보드 페이지 입니다."
6
+ call_to_action: "대시보드에 섹션을 추가하시려면 'app/admin/dashboard.rb' 파일을 수정하십시오."
7
7
  view: "보기"
8
8
  edit: "수정"
9
9
  delete: "삭제"
10
10
  delete_confirmation: "정말로 삭제 하시겠습니까?"
11
- new_model: "%{model}"
11
+ new_model: "%{model} 추가"
12
12
  edit_model: "%{model} 수정"
13
13
  delete_model: "%{model} 삭제"
14
14
  details: "%{model} 상세보기"
15
15
  cancel: "취소"
16
- empty: "비었음"
16
+ empty: "내용이 없습니다"
17
17
  previous: "이전"
18
18
  next: "다음"
19
19
  download: "다운로드:"
@@ -25,66 +25,96 @@ ko:
25
25
  filter: "필터"
26
26
  clear: "필터 초기화"
27
27
  predicates:
28
- contains: "포함"
29
- equals: "같다"
30
- starts_with: " 시작"
31
- ends_with: " 종료"
32
- greater_than: "크다"
33
- less_than: "작다"
28
+ contains: "포함하는 문구"
29
+ equals: "일치하는 문구"
30
+ starts_with: "시작하는 문구"
31
+ ends_with: "종료하는 문구"
32
+ greater_than: "초과"
33
+ less_than: "미만"
34
+ search_status:
35
+ headline: "검색 범위:"
36
+ current_filters: "적용된 필터:"
37
+ no_current_filters: "현재 적용된 필터가 없습니다"
34
38
  status_tag:
35
- "yes": ""
39
+ "yes": "있음"
36
40
  "no": "없음"
37
- main_content: "내용을 보시려면 %{model}#main_content 구현해 주시기 바랍니다."
41
+ main_content: "내용을 보시려면 %{model}#main_content 코드를 먼저 구현해 주시기 바랍니다."
38
42
  logout: "로그아웃"
39
43
  powered_by: "Powered by %{active_admin} %{version}"
40
44
  sidebars:
41
45
  filters: "필터 목록"
46
+ search_status: "검색 상태"
42
47
  pagination:
43
48
  empty: "%{model} 이/가 없습니다."
44
- one: "<b>1</b> %{model} 표시중"
45
- one_page: "<b>전체 %{n}</b> %{model} 표시중"
46
- multiple: "전체 <b>%{total}</b> 중 <b>%{from}&nbsp;-&nbsp;%{to}</b> %{model} 표시중"
47
- multiple_without_total: "<b>%{from}&nbsp;-&nbsp;%{to}</b> %{model} 표시중"
49
+ one: "<b>1</b>개 %{model} 표시중"
50
+ one_page: "<b>%{n}</b>개 %{model} 표시중"
51
+ multiple: "<b>%{total}</b>개 중 <b>%{from}&nbsp;-&nbsp;%{to}</b> %{model} 표시중"
52
+ multiple_without_total: "<b>%{from}&nbsp;-&nbsp;%{to}</b> %{model} 표시중"
53
+ entry:
54
+ one: "항목"
55
+ other: "항목들"
48
56
  any: "어떤"
49
57
  blank_slate:
50
58
  content: "아직 %{resource_name} 이/가 없습니다."
51
- link: "만들기"
59
+ link: "추가하기"
52
60
  dropdown_actions:
53
61
  button_label: "작업"
54
62
  batch_actions:
55
63
  button_label: "배치 작업"
56
- default_confirmation: "당신은이 작업을 수행 하 시겠습니까?"
57
- delete_confirmation: "당신은 이들을 삭제하시겠습니까 %{plural_model}?"
64
+ default_confirmation: "확실하십니까?"
65
+ delete_confirmation: "%{plural_model}을/를 삭제하시겠습니까?"
58
66
  succesfully_destroyed:
59
- one: "성공적으로 파괴 1 %{model}"
60
- other: "성공적으로 파괴 %{count} %{plural_model}"
61
- selection_toggle_explanation: "(전환 선택)"
62
- link: "만들기"
63
- action_label: "%{title} 선택된"
67
+ one: "성공적으로 1 %{model}을/를 삭제하였습니다"
68
+ other: "성공적으로 %{count}개의 %{plural_model}을/를 삭제하였습니다"
69
+ selection_toggle_explanation: "(선택 항목 바꾸기)"
70
+ link: "만들기"
71
+ action_label: "%{title} 선택됨"
64
72
  labels:
65
73
  destroy: "삭제"
66
74
  comments:
67
- body: ""
68
- author: "저자"
69
- title: "논평"
70
- add: "코멘트를 추가"
71
- resource: "자원"
72
- no_comments_yet: "아직 코멘트가 없습니다."
75
+ created_at: "작성시간"
76
+ resource_type: "첨부파일 형태"
77
+ author_type: "글쓴이 종류"
78
+ body: "내용"
79
+ author: "글쓴이"
80
+ title: "제목"
81
+ add: "댓글 추가"
82
+ resource: "첨부파일"
83
+ no_comments_yet: "아직 댓글이 없습니다."
73
84
  title_content: "댓글 (%{count})"
74
85
  errors:
75
- empty_text: "댓글이 저장되지 않았습니다, ​​텍스트가 비어 있었어."
86
+ empty_text: "댓글이 저장되지 않았습니다. 내용을 입력해주세요."
76
87
  devise:
88
+ username:
89
+ title: "아이디"
90
+ email:
91
+ title: "이메일"
92
+ subdomain:
93
+ title: "서브도메인"
94
+ password:
95
+ title: "비밀번호"
96
+ sign_up:
97
+ title: "가입하기"
98
+ submit: "가입하기"
77
99
  login:
78
100
  title: "로그인"
79
101
  remember_me: "내 계정 정보 기억"
80
102
  submit: "로그인"
81
103
  reset_password:
82
- title: "비밀 번호를 잊으 셨나요?"
83
- submit: "비밀 번호를 재설정"
104
+ title: "비밀번호를 잊으셨나요?"
105
+ submit: "비밀번호 재설정"
84
106
  change_password:
85
- title: "비밀 번호를 변경"
86
- submit: "내 비밀 번호 변경"
107
+ title: "비밀번호 변경"
108
+ submit: "내 비밀번호 변경"
109
+ unlock:
110
+ title: "계정 잠금 해제하기"
111
+ submit: "계정 잠금 해제하기"
112
+ resend_confirmation_instructions:
113
+ title: "계정 승인 요청하기"
114
+ submit: "계정 승인 요청하기"
87
115
  links:
88
116
  sign_in: "로그인"
89
- forgot_your_password: "비밀 번호를 잊으 셨나요?"
117
+ forgot_your_password: "비밀번호를 잊으셨나요?"
90
118
  sign_in_with_omniauth_provider: "%{provider} 으로 로그인"
119
+ resend_unlock_instructions: "계정 잠금 해제하기"
120
+ resend_confirmation_instructions: "계정 승인 요청하기"