activeadmin 2.5.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d4b2286091c361bd4e0e7b408ed7e4f6bf3aa118492ed037cb51b2f6e882cf4
-  data.tar.gz: b9381cb429a6ccfda90d0a51f646c759843c387bda107dcb3d66cffa26cd083f
+  metadata.gz: 6ab0e48981374c48c42109adc93edce137eed195218c8b7d26a8895f1a3e3e85
+  data.tar.gz: f4a1228efba99ed7d3bdcd93330fb7687fd321521e7ca521c1363ed1a72f3bf6
 SHA512:
-  metadata.gz: 8dba7ffe9ed0516ebfc0f484d548962d677d9d6a36cbf097c0e76e06db7ef87c0469791fdb7917ddd2b831927225958107a16aab3cd096f1ffbf8bc49ebf697d
-  data.tar.gz: d9dd9f7295fe4f0ccc852ab375637578c86621bd30435d62f2c7d7754ccb5693910aa39e0a154fdbd5535613b3f829ef31a8520761162006e12755e85db9dabb
+  metadata.gz: 3c98537ec2c59cfca738a38c5a0c905f15f55fa4aafb3bb9680880f628e89ad8226458b1a950a9ce717c01bc7a72dd6e6b906c77088a0096bf9b4397ae9475bd
+  data.tar.gz: 3af41a29c2c5602198b7f614360f223c53c2f0c47b931fca189f30d96decfc4211697dea7cfc364e1ea218015259622c2180a15b0164db86615255363ca983f5

data/CHANGELOG.md

@@ -2,6 +2,41 @@
 
 ## Unreleased
 
+## 2.7.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.6.1..v2.7.0)
+
+### Enhancements
+
+* Extend menu to allow for nested submenus. [#5994] by [@taralbass]
+* Add Webpacker compatibility with opt-in config switch and installation generator. [#5855] by [@sgara]
+
+### Bug Fixes
+
+* Fix scopes renderer when resource has only optional scopes and their conditions are false. [#6149] by [@Looooong]
+* Fix some missing wrapper markup in "logged out" layout. [#6086] by [@irmela]
+* Fix some typos in Vietnamese translation. [#6099] by [@giapnhdev]
+
+## 2.6.1 [☰](https://github.com/activeadmin/activeadmin/compare/v2.6.0..v2.6.1)
+
+### Bug Fixes
+
+* Fix some ruby 2.7 warnings about keyword args. [#6000] by [@vcsjones]
+* Missing `create_another` translation in Vietnamese. [#6002] by [@imcvampire]
+* Using "destroy" for user facing message is too robotic, prefer "delete". [#6047] by [@vfonic]
+* Typo in confirmation message for comment deletion. [#6047] by [@vfonic]
+
+## 2.6.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.5.0..v2.6.0)
+
+### Enhancements
+
+* Display multiple flash messages in separate elements. [#5929] by [@mirelon]
+* Make delete confirmation messages in French & Spanish gender-neutral. [#5946] by [@cprodhomme]
+
+### Bug Fixes
+
+* Export ModalDialog component to re-enable client side usage. [#5956] by [@sgara]
+* Use default ActionView options instead of default Formtastic options for DateRangeInput [#5957] by [@mirelon]
+* Fix i18n key in docs example to translate scopes. [#5943] by [@adler99]
+
 ## 2.5.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.4.0..v2.5.0)
 
 ### Enhancements
@@ -13,7 +48,7 @@
 * Convert namespace to sym to prevent duplicate namespaces such as :foo and 'foo'. [#5931] by [@westonganger]
 * Use filter label when condition has a predicate. [#5886] by [@ko-lem]
 * Fix error when routing with array containing symbol. [#5870] by [@jwesorick]
-* Fix error when there is a model named `Tag` and `meta_tags` have been configured. [#5893] by [@micred], [@FabioRos] and [@deivid-rodriguez]
+* Fix error when there is a model named `Tag` and `meta_tags` have been configured. [#5895] by [@micred], [@FabioRos] and [@deivid-rodriguez]
 * Allow specifying custom `input_html` for `DateRangeInput`. [#5867] by [@mirelon]
 * Adjust `#main_content` right margin to take into account possible custom values of `$sidebar-width` and `$section-padding`. [#5887] by [@guigs]
 * Improved polymorphic routes generation to avoid problems when multiple `belongs_to` are defined. [#5938] by [@leio10]
@@ -514,18 +549,33 @@ Please check [0-6-stable] for previous changes.
 [#5548]: https://github.com/activeadmin/activeadmin/pull/5548
 [#5842]: https://github.com/activeadmin/activeadmin/pull/5842
 [#5854]: https://github.com/activeadmin/activeadmin/pull/5854
+[#5855]: https://github.com/activeadmin/activeadmin/pull/5855
 [#5874]: https://github.com/activeadmin/activeadmin/pull/5874
 [#5877]: https://github.com/activeadmin/activeadmin/pull/5877
 [#5886]: https://github.com/activeadmin/activeadmin/pull/5886
 [#5870]: https://github.com/activeadmin/activeadmin/pull/5870
-[#5893]: https://github.com/activeadmin/activeadmin/pull/5893
+[#5894]: https://github.com/activeadmin/activeadmin/pull/5894
+[#5895]: https://github.com/activeadmin/activeadmin/pull/5895
 [#5867]: https://github.com/activeadmin/activeadmin/pull/5867
 [#5887]: https://github.com/activeadmin/activeadmin/pull/5887
 [#5931]: https://github.com/activeadmin/activeadmin/pull/5931
 [#5938]: https://github.com/activeadmin/activeadmin/pull/5938
+[#5929]: https://github.com/activeadmin/activeadmin/pull/5929
+[#5943]: https://github.com/activeadmin/activeadmin/pull/5943
+[#5946]: https://github.com/activeadmin/activeadmin/pull/5946
+[#5956]: https://github.com/activeadmin/activeadmin/pull/5956
+[#5957]: https://github.com/activeadmin/activeadmin/pull/5957
+[#6000]: https://github.com/activeadmin/activeadmin/pull/6000
+[#6002]: https://github.com/activeadmin/activeadmin/pull/6002
+[#6047]: https://github.com/activeadmin/activeadmin/pull/6047
+[#5994]: https://github.com/activeadmin/activeadmin/pull/5994
+[#6149]: https://github.com/activeadmin/activeadmin/pull/6149
+[#6086]: https://github.com/activeadmin/activeadmin/pull/6086
+[#6099]: https://github.com/activeadmin/activeadmin/pull/6099
 
 [@5t111111]: https://github.com/5t111111
 [@aarek]: https://github.com/aarek
+[@adler99]: https://github.com/adler99
 [@ajw725]: https://github.com/ajw725
 [@alex-bogomolov]: https://github.com/alex-bogomolov
 [@amiel]: https://github.com/amiel
@@ -538,6 +588,7 @@ Please check [0-6-stable] for previous changes.
 [@chancancode]: https://github.com/chancancode
 [@chrp]: https://github.com/chrp
 [@chumakoff]: https://github.com/chumakoff
+[@cprodhomme]: https://github.com/cprodhomme
 [@craigmcnamara]: https://github.com/craigmcnamara
 [@DanielHeath]: https://github.com/DanielHeath
 [@deivid-rodriguez]: https://github.com/deivid-rodriguez
@@ -551,10 +602,12 @@ Please check [0-6-stable] for previous changes.
 [@FabioRos]: https://github.com/FabioRos
 [@faucct]: https://github.com/faucct
 [@Fivell]: https://github.com/Fivell
+[@giapnhdev]: https://github.com/giapnhdev
 [@glebtv]: https://github.com/glebtv
 [@gonzedge]: https://github.com/gonzedge
 [@guigs]: https://github.com/guigs
 [@HappyKadaver]: https://github.com/HappyKadaver
+[@imcvampire]: https://github.com/imcvampire
 [@innparusu95]: https://github.com/innparusu95
 [@ionut998]: https://github.com/ionut998
 [@irmela]: https://github.com/irmela
@@ -572,6 +625,7 @@ Please check [0-6-stable] for previous changes.
 [@Kris-LIBIS]: https://github.com/Kris-LIBIS
 [@kwent]: https://github.com/kwent
 [@leio10]: https://github.com/leio10
+[@Looooong]: https://github.com/Looooong
 [@markstory]: https://github.com/markstory
 [@mauriciopasquier]: https://github.com/mauriciopasquier
 [@mconiglio]: https://github.com/mconiglio
@@ -594,10 +648,13 @@ Please check [0-6-stable] for previous changes.
 [@shouya]: https://github.com/shouya
 [@stefsava]: https://github.com/stefsava
 [@stereoscott]: https://github.com/stereoscott
+[@taralbass]: https://github.com/taralbass
 [@tiagotex]: https://github.com/tiagotex
 [@timoschilling]: https://github.com/timoschilling
 [@TimPetricola]: https://github.com/TimPetricola
 [@varyonic]: https://github.com/varyonic
+[@vcsjones]: https://github.com/vcsjones
+[@vfonic]: https://github.com/vfonic
 [@violeta-p]: https://github.com/violeta-p
 [@WaKeMaTTa]: https://github.com/WaKeMaTTa
 [@wasifhossain]: https://github.com/wasifhossain

data/CONTRIBUTING.md

@@ -5,10 +5,12 @@ like you that make Active Admin such a great tool.
 
 ### Where do I go from here?
 
-If you've noticed a bug or have a question that doesn't belong on the [mailing
-list] or [Stack Overflow], [search the issue tracker] to see if someone else in
-the community has already created a ticket. If not, go ahead and [make one][new
-issue]!
+If you've noticed a bug or have a feature request, [make one][new issue]! It's
+generally best if you get confirmation of your bug or approval for your feature
+request this way before starting to code.
+
+If you have a general question about activeadmin, you can post it on [Stack
+Overflow], the issue tracker is only for bugs and feature requests.
 
 ### Fork & create a branch
 
@@ -67,22 +69,6 @@ export BUNDLE_GEMFILE=gemfiles/rails_60/Gemfile
 **Warning** SCSS assets are aimed to be used indifferently with Sprockets **and** webpacker.
 As such, make sure not to use any sass-rails directives such as `asset-url` or `image-url`.
 
-### Did you find a bug?
-
-* **Ensure the bug was not already reported** by [searching all issues].
-
-* If you're unable to find an open issue addressing the problem,
-  [open a new one][new issue]. Be sure to include a **title and clear
-  description**, as much relevant information as possible, and a **code sample**
-  or an **executable test case** demonstrating the expected behavior that is not
-  occurring.
-
-* If possible, use the relevant bug report templates to create the issue.
-  Simply copy the content of the appropriate template into a .rb file, make the
-  necessary changes to demonstrate the issue, and **paste the content into the
-  issue description**:
-  * [**ActiveAdmin** master issues][master template]
-
 ### Implement your fix or feature
 
 At this point, you're ready to make your changes! Feel free to ask for help;
@@ -205,36 +191,20 @@ met.
 Maintainers need to do the following to push out a release:
 
 * Make sure all pull requests are in and that changelog is current
-* Update `version.rb` file and changelog with new version number
-* If it's not a patch level release, create a stable branch for that release,
-  otherwise switch to the stable branch corresponding to the patch release you
-  want to ship:
-
-  ```sh
-  git checkout master
-  git fetch activeadmin
-  git rebase activeadmin/master
-  # If the release is 2.1.x then this should be: 2-1-stable
-  git checkout -b N-N-stable
-  git push activeadmin N-N-stable:N-N-stable
-  ```
-
+* Switch to the master branch and make sure it's up to date.
 * Make sure you have [chandler] properly configured. Chandler is used to
   automatically submit github release notes from the changelog right after
   pushing the gem to rubygems.
-* `bin/rake release`
+* Run one of `bin/rake release:prepare_{prerelease,prepatch,patch,preminor,minor,premajor,major}`, push the result and create a PR.
+* Run `bin/rake release` from the target branch once the PR is merged.
 
 [chandler]: https://github.com/mattbrictson/chandler#2-configure-credentials
-[mailing list]: http://groups.google.com/group/activeadmin
 [Stack Overflow]: http://stackoverflow.com/questions/tagged/activeadmin
-[search the issue tracker]: https://github.com/activeadmin/activeadmin/issues?q=something
 [new issue]: https://github.com/activeadmin/activeadmin/issues/new
 [fork Active Admin]: https://help.github.com/articles/fork-a-repo
-[searching all issues]: https://github.com/activeadmin/activeadmin/issues?q=
-[master template]: https://github.com/activeadmin/activeadmin/blob/master/tasks/bug_report_template.rb
 [make a pull request]: https://help.github.com/articles/creating-a-pull-request
 [git rebasing]: http://git-scm.com/book/en/Git-Branching-Rebasing
-[interactive rebase]: https://help.github.com/articles/interactive-rebase
+[interactive rebase]: https://help.github.com/en/github/using-git/about-git-rebase
 [shortcut reference links]: https://github.github.com/gfm/#shortcut-reference-link
 [Rollup]: https://rollupjs.org/guide/en/#quick-start
 [Yarn]: https://yarnpkg.com/en/docs/install

data/README.md

@@ -93,7 +93,7 @@ Thanks to [Open Collective][opencollective contributors] and all our Open Collec
 
 [rubygems_badge]: http://img.shields.io/gem/v/activeadmin.svg
 [rubygems]: https://rubygems.org/gems/activeadmin
-[circle_badge]: https://circleci.com/gh/activeadmin/activeadmin/tree/master.svg
+[circle_badge]: https://circleci.com/gh/activeadmin/activeadmin/tree/master.svg?style=svg
 [circle]: https://circleci.com/gh/activeadmin/activeadmin/tree/master
 [coverage_badge]: https://api.codeclimate.com/v1/badges/779e407d22bacff19733/test_coverage
 [coverage]: https://codeclimate.com/github/activeadmin/activeadmin/test_coverage
@@ -101,7 +101,7 @@ Thanks to [Open Collective][opencollective contributors] and all our Open Collec
 [inch]: http://inch-ci.org/github/activeadmin/activeadmin
 [tidelift_badge]: https://tidelift.com/badges/github/activeadmin/activeadmin
 [tidelift]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=readme
-[tidelift_enterprise]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=github&utm_content=enterprise
+[tidelift_enterprise]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=enterprise
 [tidelift_support]: https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral&utm_campaign=github&utm_content=support
 
 [docs]: http://activeadmin.info/0-installation.html

data/app/assets/javascripts/active_admin/base.js

@@ -10,9 +10,10 @@
 //= require jquery_ujs
 //= require_self
 
-(function(factory) {
-  typeof define === "function" && define.amd ? define([ "jquery", "jquery-ui/ui/widgets/datepicker", "jquery-ui/ui/widgets/dialog", "jquery-ui/ui/widgets/sortable", "jquery-ui/ui/widgets/tabs", "jquery-ui/ui/widget", "jquery-ujs" ], factory) : factory();
-})(function() {
+(function(global, factory) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("jquery"), require("jquery-ui/ui/widgets/datepicker"), require("jquery-ui/ui/widgets/dialog"), require("jquery-ui/ui/widgets/sortable"), require("jquery-ui/ui/widgets/tabs"), require("jquery-ui/ui/widget"), require("jquery-ujs")) : typeof define === "function" && define.amd ? define([ "exports", "jquery", "jquery-ui/ui/widgets/datepicker", "jquery-ui/ui/widgets/dialog", "jquery-ui/ui/widgets/sortable", "jquery-ui/ui/widgets/tabs", "jquery-ui/ui/widget", "jquery-ujs" ], factory) : (global = global || self, 
+  factory(global.ActiveAdmin = {}));
+})(this, function(exports) {
   "use strict";
   $.fn.serializeObject = function() {
     return this.serializeArray().reduce(function(obj, item) {
@@ -506,4 +507,13 @@
     return $("#active_admin_content .tabs").tabs();
   };
   $(document).ready(onDOMReady$2).on("page:load turbolinks:load", onDOMReady$2);
+  function modal_dialog(message, inputs, callback) {
+    console.warn("ActiveAdmin.modal_dialog is deprecated in favor of ActiveAdmin.ModalDialog, please update usage.");
+    return ModalDialog(message, inputs, callback);
+  }
+  exports.ModalDialog = ModalDialog;
+  exports.modal_dialog = modal_dialog;
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
 });

data/app/assets/stylesheets/active_admin/_header.scss

@@ -52,6 +52,11 @@
     margin: 0;
     padding: 0;
 
+    li {
+      /* Hover on li, display the ul */
+      &:hover > ul { display: block;}
+    }
+
     & > li {
       display: inline-block;
       margin-right: 4px;
@@ -95,8 +100,6 @@
       }
 
 
-      /* Hover on li, display the ul */
-      &:hover ul { display: block;}
       /* Drop down menus */
       ul {
         background: $hover-menu-item-background;
@@ -114,6 +117,7 @@
         z-index: 1010;
 
         li {
+          position: relative;
           margin: 0px;
           a {
             background: none;
@@ -124,10 +128,40 @@
           &.current {
             a { @include rounded(0) }
           }
+
+          &.has_nested > a {
+            background: url($menu-arrow-right-light-icon-url) no-repeat calc(100% - 7px) 55%;
+            padding-right: 20px;
+          }
+
+          &.has_nested:hover > a {
+            background: url($menu-arrow-right-dark-icon-url) no-repeat calc(100% - 7px) 55%;
+            color: #fff;
+          }
+
+          ul {
+            @include rounded-all(10px,10px,10px,10px);
+            margin-top: 0;
+            top: -3px;
+            left: 100%;
+
+            /* Create an invisible backdrop that adds 8px margin around the dropdown menu or submenu
+               that maintains the hover. This makes it much easier to navigate to submenus in
+               particular without losing hover accientally, especially near rounded corners. */
+            &:after {
+              content: "";
+              display: block;
+              position: absolute;
+              top: -8px;
+              left: -8px;
+              height: calc(100% + 16px);
+              width: calc(100% + 16px);
+              z-index: -2;
+            }
+          }
         }
       }
     }
-
   }
 
   #tabs {

data/app/assets/stylesheets/active_admin/mixins/_variables.scss

@@ -5,6 +5,9 @@
 // Images
 $menu-arrow-light-icon-url: 'data:image/png;base64,R0lGODlhBwAEAKIAAL6+vry8vIiIiJWVlf///3t7ewAAAAAAACH5BAEAAAUALAAAAAAHAAQAAAMLWLol80MoF5mQKgEAOw==' !default;
 $menu-arrow-dark-icon-url: 'data:image/png;base64,R0lGODlhBwAEAKIAAG1tbWxsbElJSVBQUP///0JCQgAAAAAAACH5BAEAAAUALAAAAAAHAAQAAAMLWLol80MoF5mQKgEAOw==' !default;
+$menu-arrow-right-light-icon-url: 'data:image/gif;base64,R0lGODlhBAAHAKECAKqqqszMzPkVFfkVFSH+EUNyZWF0ZWQgd2l0aCBHSU1QACH5BAEKAAIALAAAAAAEAAcAAAIJlA0XKbH9nmAFADs=' !default;
+$menu-arrow-right-dark-icon-url: 'data:image/gif;base64,R0lGODlhBAAHAMIEAG1tbWxsbElJSVBQUPkVFfkVFfkVFfkVFSH+EUNyZWF0ZWQgd2l0aCBHSU1QACH5BAEKAAEALAAAAAAEAAcAAAMKGKqy02G8OGeACQA7' !default;
+
 $orderable-icon-url: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAABGCAYAAAAAVo4aAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAH5JREFUeNpi3LhlOwMU1AExGxDXwARYoHQLEFdD2cxAXAliMKFJgEAFEHfBJEHGMKLhMpgkTsAEdch/NNwCk2xCdiEQtML4LEgCf6EubUX3Cgh0oNvJ+P//f7wOGpUclRwYSZb41CyidNbB8giNM+9oXhmVHHm5bJjUSAABBgDKKiwMMUxPwgAAAABJRU5ErkJggg==' !default;
 
 // Colors

data/app/javascript/active_admin/base.js

@@ -17,3 +17,12 @@ import "./initializers/has-many"
 import "./initializers/per-page"
 import "./initializers/table-checkbox-toggler"
 import "./initializers/tabs"
+
+import ModalDialog from "./lib/modal-dialog";
+
+function modal_dialog(message, inputs, callback) {
+  console.warn("ActiveAdmin.modal_dialog is deprecated in favor of ActiveAdmin.ModalDialog, please update usage.");
+  return ModalDialog(message, inputs, callback);
+}
+
+export { ModalDialog, modal_dialog };

data/app/views/layouts/active_admin_logged_out.html.erb

@@ -6,10 +6,18 @@
   <title><%= [@page_title, ActiveAdmin.application.site_title(self)].compact.join(" | ") %></title>
 
   <% ActiveAdmin.application.stylesheets.each do |style, options| %>
-    <%= stylesheet_link_tag style, options %>
+    <% if ActiveAdmin.application.use_webpacker %>
+      <%= stylesheet_pack_tag style, options %>
+    <% else %>
+      <%= stylesheet_link_tag style, options %>
+    <% end %>
   <% end %>
   <% ActiveAdmin.application.javascripts.each do |path| %>
-    <%= javascript_include_tag path %>
+    <% if ActiveAdmin.application.use_webpacker %>
+      <%= javascript_pack_tag path %>
+    <% else %>
+      <%= javascript_include_tag path %>
+    <% end %>
   <% end %>
 
   <%= favicon_link_tag ActiveAdmin.application.favicon if ActiveAdmin.application.favicon %>
@@ -24,9 +32,11 @@
 <div id="wrapper">
 
   <div id="content_wrapper">
-    <% flash_messages.each do |type, message| %>
-      <%= content_tag :div, message, class: "flash flash_#{type}" %>
-    <% end %>
+    <div class="flashes">
+      <% flash_messages.each do |type, message| %>
+        <%= content_tag :div, message, class: "flash flash_#{type}" %>
+      <% end %>
+    </div>
     <div id="active_admin_content">
       <%= yield %>
     </div>

data/config/locales/en-CA.yml

@@ -68,8 +68,8 @@
       default_confirmation: "Are you sure you want to do this?"
       delete_confirmation: "Are you sure you want to delete these %{plural_model}?"
       succesfully_destroyed:
-        one: "Successfully destroyed 1 %{model}"
-        other: "Successfully destroyed %{count} %{plural_model}"
+        one: "Successfully deleted 1 %{model}"
+        other: "Successfully deleted %{count} %{plural_model}"
       selection_toggle_explanation: "(Toggle Selection)"
       action_label: "%{title} Selected"
       labels:
@@ -82,7 +82,7 @@
       author: "Author"
       add: "Add Comment"
       delete: "Delete Comment"
-      delete_confirmation: "Are you sure you want to delete these comment?"
+      delete_confirmation: "Are you sure you want to delete these comments?"
       resource: "Resource"
       no_comments_yet: "No comments yet."
       author_missing: "Anonymous"

data/config/locales/en-GB.yml

@@ -68,8 +68,8 @@
       default_confirmation: "Are you sure you want to do this?"
       delete_confirmation: "Are you sure you want to delete these %{plural_model}?"
       succesfully_destroyed:
-        one: "Successfully destroyed 1 %{model}"
-        other: "Successfully destroyed %{count} %{plural_model}"
+        one: "Successfully deleted 1 %{model}"
+        other: "Successfully deleted %{count} %{plural_model}"
       selection_toggle_explanation: "(Toggle Selection)"
       action_label: "%{title} Selected"
       labels:
@@ -82,7 +82,7 @@
       author: "Author"
       add: "Add Comment"
       delete: "Delete Comment"
-      delete_confirmation: "Are you sure you want to delete these comment?"
+      delete_confirmation: "Are you sure you want to delete these comments?"
       resource: "Resource"
       no_comments_yet: "No comments yet."
       author_missing: "Anonymous"

data/config/locales/en.yml

@@ -91,8 +91,8 @@ en:
       default_confirmation: "Are you sure you want to do this?"
       delete_confirmation: "Are you sure you want to delete these %{plural_model}?"
       succesfully_destroyed:
-        one: "Successfully destroyed 1 %{model}"
-        other: "Successfully destroyed %{count} %{plural_model}"
+        one: "Successfully deleted 1 %{model}"
+        other: "Successfully deleted %{count} %{plural_model}"
       selection_toggle_explanation: "(Toggle Selection)"
       action_label: "%{title} Selected"
       labels:
@@ -105,7 +105,7 @@ en:
       author: "Author"
       add: "Add Comment"
       delete: "Delete Comment"
-      delete_confirmation: "Are you sure you want to delete these comment?"
+      delete_confirmation: "Are you sure you want to delete these comments?"
       resource: "Resource"
       no_comments_yet: "No comments yet."
       author_missing: "Anonymous"

data/config/locales/es.yml

@@ -23,7 +23,7 @@ es:
     view: "Ver"
     edit: "Editar"
     delete: "Eliminar"
-    delete_confirmation: "¿Está seguro de que quiere eliminar esto?"
+    delete_confirmation: "¿Confirma que desea borrar este elemento?"
     create_another: "Crear otro %{model}"
     new_model: "Añadir %{model}"
     edit_model: "Editar %{model}"
@@ -89,7 +89,7 @@ es:
     batch_actions:
       button_label: "Acciones en masa"
       default_confirmation: "¿Seguro que quieres hacer esto?"
-      delete_confirmation: "Eliminar %{plural_model}: ¿Está seguro?"
+      delete_confirmation: "Se eliminarán %{plural_model}. ¿Desea continuar?"
       succesfully_destroyed:
         one: "Se ha destruido 1 %{model} con éxito"
         other: "Se han destruido %{count} %{plural_model} con éxito"
@@ -105,7 +105,7 @@ es:
       author: "Autor"
       add: "Comentar"
       delete: "Borrar Comentario"
-      delete_confirmation: "¿Está seguro que desea borrar este comentario?"
+      delete_confirmation: "¿Confirma que desea borrar este comentario?"
       resource: "Recurso"
       no_comments_yet: "No hay comentarios aún."
       author_missing: "Anónimo"

data/config/locales/fr.yml

@@ -7,7 +7,7 @@ fr:
     view: "Voir"
     edit: "Modifier"
     delete: "Supprimer"
-    delete_confirmation: "Êtes-vous certain de vouloir supprimer ceci ?"
+    delete_confirmation: "Voulez-vous vraiment supprimer ceci ?"
     create_another: "Créer autre %{model}"
     new_model: "Créer %{model}"
     edit_model: "Modifier %{model}"
@@ -69,8 +69,8 @@ fr:
       button_label: "Actions"
     batch_actions:
       button_label: "Actions groupées"
-      default_confirmation: "Êtes-vous sûr de vouloir faire cela ?"
-      delete_confirmation: "Êtes-vous sûr de vouloir supprimer ces %{plural_model} ?"
+      default_confirmation: "Voulez-vous vraiment faire cela ?"
+      delete_confirmation: "Voulez-vous vraiment supprimer ces %{plural_model} ?"
       succesfully_destroyed:
         one: "1 %{model} supprimé"
         other: "%{count} %{plural_model} supprimés"
@@ -86,7 +86,7 @@ fr:
       author: "Auteur"
       add: "Ajouter un commentaire"
       delete: "Supprimer ce commentaire"
-      delete_confirmation: "Êtes-vous sûr de vouloir supprimer ce commentaire ?"
+      delete_confirmation: "Voulez-vous vraiment supprimer ce commentaire ?"
       resource: "Ressource"
       no_comments_yet: "Aucun commentaire actuellement"
       author_missing: "Anonyme"

data/config/locales/lv.yml

@@ -60,8 +60,8 @@ lv:
       default_confirmation: "Vai tiešām vēlaties to darīt?"
       delete_confirmation: "Vai tiešām vēlaties dzēst šos %{plural_model}?"
       succesfully_destroyed:
-        one: "Successfully destroyed 1 %{model}"
-        other: "Successfully destroyed %{count} %{plural_model}"
+        one: "Successfully deleted 1 %{model}"
+        other: "Successfully deleted %{count} %{plural_model}"
       selection_toggle_explanation: "(Toggle Selection)"
       action_label: "%{title} Selected"
       labels:

data/config/locales/vi.yml

@@ -3,20 +3,21 @@ vi:
     dashboard: Bảng điều khiển
     dashboard_welcome:
       welcome: "Chào mừng bạn đến với Active Admin. Đây là trang điều khiển mặc định."
-      call_to_action: "Để thêm phần phần cho trang điều khiển hãy chỉnh sửa 'app/admin/dashboard.rb'"
+      call_to_action: "Để thêm thành phần cho trang điều khiển hãy chỉnh sửa 'app/admin/dashboard.rb'"
     view: "Xem"
     edit: "Chỉnh sửa"
     delete: "Xóa"
-    delete_confirmation: "Bạn có chắc chắn rằng mình muốn xóa cái này?"
+    delete_confirmation: "Bạn có chắc chắn rằng mình muốn xóa không?"
     new_model: "Tạo mới %{model}"
     edit_model: "Chỉnh sửa %{model}"
     delete_model: "Xóa %{model}"
+    create_another: "Tạo thêm %{model}"
     details: "%{model} Chi tiết"
     cancel: "Hủy"
     empty: "Trống"
     previous: "Trước"
-    next: "Tiếp"
-    download: "Download:"
+    next: "Sau"
+    download: "Tải về:"
     has_many_new: "Thêm mới %{model}"
     has_many_delete: "Xóa"
     has_many_remove: "Hủy bỏ"
@@ -28,7 +29,7 @@ vi:
         contains: "Có chứa"
         equals: "Bằng"
         starts_with: "Bắt đầu với"
-        ends_with: "Kết thúc với việc"
+        ends_with: "Kết thúc bởi"
         greater_than: "Lớn hơn"
         less_than: "Nhỏ hơn"
         gteq_datetime: "Lớn hơn hoặc bằng"

data/docs/0-installation.md

@@ -51,8 +51,8 @@ The generator adds these core files, among others:
 Now, migrate and seed your database before starting the server:
 
 ```sh
-rake db:migrate
-rake db:seed
+rails db:migrate
+rails db:seed
 rails server
 ```
 
@@ -112,6 +112,30 @@ Draper::CollectionDecorator.send :delegate, :per_page_kaminari
 
 If you're getting the error `wrong number of arguments (6 for 4..5)`, [read #2703].
 
+## webpacker
+
+For new apps starting with Rails 6.0, Webpacker has become the default asset generator. You can **opt-in to using Webpacker for ActiveAdmin assets** as well by updating your configuration to turn on the `use_webpacker` option, either at installation time or manually.
+
+* at active_admin installation:
+
+  ```sh
+  rails g active_admin:install --use_webpacker
+  ```
+
+* manually:
+
+  ```ruby
+  ActiveAdmin.setup do |config|
+    config.use_webpacker = true
+  end
+  ```
+
+  And run the generator to get default Active Admin assets:
+
+  ```sh
+  rails g active_admin:webpacker
+  ```
+
 [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

data/docs/2-resource-customization.md

@@ -164,7 +164,8 @@ The menu method accepts a hash with the following options:
 
 * `:label` - The string or proc label to display in the menu. If it's a proc, it
   will be called each time the menu is rendered.
-* `:parent` - The string id (or label) of the parent used for this menu
+* `:parent` - The string id (or label) of the parent used for this menu, or an array
+  of string ids (or labels) for a nested menu
 * `:if` - A block or a symbol of a method to call to decide if the menu item
   should be displayed
 * `:priority` - The integer value of the priority, which defaults to `10`
@@ -227,6 +228,14 @@ end
 Note that the "Blog" parent menu item doesn't even have to exist yet; it can be
 dynamically generated for you.
 
+To further nest an item under a submenu, provide an array of parents.
+
+```ruby
+ActiveAdmin.register Post do
+  menu parent: ["Admin", "Blog"]
+end
+```
+
 ### Customizing Parent Menu Items
 
 All of the options given to a standard menu item are also available to

data/docs/3-index-pages.md

@@ -212,7 +212,7 @@ end
 ```
 
 Scopes can be labelled with a translation, e.g.
-`activerecord.scopes.invoice.expired`.
+`active_admin.scopes.scope_method`.
 
 ### Scopes groups