activeadmin 4.0.0.beta3 → 4.0.0.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a88812de83608d40122d0287fed77af0d4656bbee68fadfd79c677454199f4a
-  data.tar.gz: 34f685397087cba22f5e6cafd177408ed59a6f017d8a6547f12c0ee0729e99d4
+  metadata.gz: 2f3c2998aa1c2b5375196a1f9ee0284c699e72a7637f9feab724c46ba0701cee
+  data.tar.gz: 670befa4df9c7d9634320c2735254a420adf7062789ec47ca4bdaa46c8915328
 SHA512:
-  metadata.gz: 244c91983c690cfd851ef194b738034276a5d8f1b1d78006dcb9ae03b5c920c15a981e1b363b292282db4fa8952a463b6b9081ec1bcb2b38a6fa0376792e9982
-  data.tar.gz: 4530d4d1123d312caf97bdee815beca6d2aa030de6c1e0a13f40258cefb5c6e04eec467ba304edfd4c917c41c3f93e564c8362889ceb842b83e8df5a180a4295
+  metadata.gz: bc6cab08a78331723344a4307ac5259f30e090e69d6438433697fbf96d43df7a11ca5f5e88d19a3e0c7cf83f833a99d663e74df4f37122b8c1d71375c8c08bea
+  data.tar.gz: 927876e56533e12df325ab50e86058dce84cb47133924fc92559ce7329b376ef6d7f574ee35517ac4115f43cd49469a5ddc308716c51621fe726ff219895950f

data/CHANGELOG.md

@@ -1,6 +1,22 @@
 # Changelog
 
-## Unreleased
+[Future changelogs have moved to GitHub Releases](https://github.com/activeadmin/activeadmin/releases)
+
+## 3.2.0 [☰](https://github.com/activeadmin/activeadmin/compare/v3.1.0..v3.2.0)
+
+### Security Fixes
+
+* Backport protect against CSV Injection. [#8167] by [@mgrunberg]
+
+### Enhancements
+
+* Backport support citext column type in string filter. [#8165] by [@mgrunberg]
+* Backport provide detail in DB statement timeout error for filters. [#8163] by [@mgrunberg]
+
+### Bug Fixes
+
+* Backport make sure menu creation does not modify menu options. [#8166] by [@mgrunberg]
+* Backport ransack error with filters when ActiveStorage is used. [#8164] by [@mgrunberg]
 
 ## 3.1.0 [☰](https://github.com/activeadmin/activeadmin/compare/v3.0.0..v3.1.0)
 
@@ -435,7 +451,7 @@ _No changes_.
 * Fixed `if:` scope option when a lambda is passed. [#5501] by [@deivid-rodriguez]
 * Comment validation adding redundant errors when resource is missing. [#5517] by [@deivid-rodriguez]
 * Fixed resource filtering by association when the resource has custom primary key. [#5446] by [@wasifhossain]
-* Fixed "create anoter" checkbox styling. [#5324] by [@faucct]
+* Fixed "create another" checkbox styling. [#5324] by [@faucct]
 
 ## 1.3.1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.3.0..v1.3.1)
 

data/CONTRIBUTING.md

@@ -28,7 +28,7 @@ Now install the development dependencies:
 ```sh
 gem install foreman
 bundle install
-bin/yarn install
+yarn install
 ```
 
 Now you should be able to run the entire suite using:
@@ -92,15 +92,11 @@ A PR can only be merged into master by a maintainer if: CI is passing, approved
 
 Maintainers need to do the following to push out a release:
 
-* 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.
-* Update the version in the `lib/active_admin/version.rb` file.
-* Run `bin/bundle` to update all gemfiles.
-* Update the `package.json` version. [Prerelease format is 1.0.0-beta1](https://github.com/rails/rails/blob/0d0c30e534af7f80ec8b18eb946aaa613ca30444/tasks/release.rb#L26).
-* Review and merge the PR. The generated changelog in the PR should include all user visible changes you intend to ship.
-* Run `bin/rake release` from the target branch once the PR is merged.
-
-[chandler]: https://github.com/mattbrictson/chandler#2-configure-credentials
+* Create a feature branch from master and make sure it's up to date.
+* Run `bin/prep-release [version]` and commit the changes. Use Ruby version format. NPM is handled automatically.
+* Optional: To confirm the release contents, run `gem build` (extract contents) and `npm publish --dry-run`.
+* Review and merge the PR.
+* Run `bin/rake release` from the default branch once the PR is merged.
+* [Create a GitHub Release](https://github.com/activeadmin/activeadmin/releases/new) by selecting the tag and generating the release notes.
+
 [new issue]: https://github.com/activeadmin/activeadmin/issues/new

data/README.md

@@ -75,8 +75,8 @@ Thanks to [Tidelift][tidelift] and all our Tidelift subscribers.
 Thanks to [Open Collective][opencollective contributors] and all our Open Collective contributors.
 
 [Arbre]: https://github.com/activeadmin/arbre
-[Devise]: https://github.com/plataformatec/devise
-[Formtastic]: https://github.com/justinfrench/formtastic
+[Devise]: https://github.com/heartcombo/devise
+[Formtastic]: https://github.com/formtastic/formtastic
 [Inherited Resources]: https://github.com/activeadmin/inherited_resources
 [Kaminari]: https://github.com/kaminari/kaminari
 [Ransack]: https://github.com/activerecord-hackery/ransack

data/UPGRADING.md

@@ -8,14 +8,14 @@ ActiveAdmin v4 uses TailwindCSS. It has **mobile web, dark mode and RTL support*
 
 These instructions assume the `cssbundling-rails` and `importmap-rails` gems are already installed and you have run their install commands in your app. If you haven't done so, please do before continuing.
 
-Update your `Gemfile` with `gem "activeadmin", "4.0.0.beta2"` and then run `gem install activeadmin --pre`.
+Update your `Gemfile` with `gem "activeadmin", "4.0.0.beta3"` and then run `gem install activeadmin --pre`.
 
 Now, run `rails generate active_admin:assets` to replace the old assets with the new files.
 
 Then add the npm package and update the `build:css` script.
 
 ```
-yarn add @activeadmin/activeadmin@4.0.0-beta2
+yarn add @activeadmin/activeadmin@4.0.0-beta3
 npm pkg set scripts.build:css="tailwindcss -i ./app/assets/stylesheets/active_admin.css -o ./app/assets/builds/active_admin.css --minify -c tailwind-active_admin.config.js"
 ```
 
@@ -191,8 +191,7 @@ Note that `@post` can also be used here but make sure to call `authorize!` on it
 This release includes several locale changes. Please [reivew the en.yml locale](https://github.com/activeadmin/activeadmin/blob/master/config/locales/en.yml) for the latest translations.
 
 - The `dashboard_welcome`, `dropdown_actions`, `main_content` and `unsupported_browser` keys have been removed.
-- Overriding Kaminari's `previous` and `next` pagination keys to only use words and remove HTML entities.
-- The `active_admin.pagination` keys have been rewritten to be less verbose.
+- The `active_admin.pagination` keys have been rewritten to be less verbose and include new entries: next and previous.
 
   ```diff
   - one: "Displaying <b>1</b> %{model}"
@@ -205,6 +204,8 @@ This release includes several locale changes. Please [reivew the en.yml locale](
   + multiple_without_total: "Showing <b>%{from}-%{to}</b>"
   - per_page: "Per page: "
   + per_page: "Per page "
+  + previous: "Previous"
+  + next: "Next"
   ```
 
 - The `search_status` key contents has multiple, breaking changes:
@@ -223,3 +224,4 @@ This release includes several locale changes. Please [reivew the en.yml locale](
 - The `comments.title_content` text has been updated with an "All " prefix.
 - The `comments.delete_confirmation` text has been fixed to use singular form.
 - Inconsistent use of login/sign-in related terms so text now uses "Sign in", Sign out", and "Sign up" throughout.
+- The `toggle_dark_mode`, `toggle_main_navigation_menu`, `toggle_section`, and `toggle_user_menu` keys have been added.

data/app/controllers/active_admin/base_controller/authorization.rb

@@ -40,7 +40,7 @@ module ActiveAdmin
       end
 
       # Authorize the action and subject. Available in the controller
-      # as well as all the views. If the action is not allowd, it raises
+      # as well as all the views. If the action is not allowed, it raises
       # an ActiveAdmin::AccessDenied exception.
       #
       # @param [Symbol] action The action to check if the user has permission

data/app/controllers/active_admin/resource_controller.rb

@@ -40,7 +40,7 @@ module ActiveAdmin
       case params[:action].to_sym
       when :index
         active_admin_config.get_page_presenter(params[:action], params[:as])
-      when :new, :edit
+      when :new, :edit, :create, :update
         active_admin_config.get_page_presenter(:form)
       end || super
     end

data/app/javascript/active_admin/features/batch_actions.js

@@ -1,11 +1,20 @@
 import Rails from '@rails/ujs';
 
+const submitForm = function() {
+  let form = document.getElementById("collection_selection")
+  if (form) {
+    form.submit()
+  }
+}
+
 const batchActionClick = function(event) {
   event.preventDefault()
   let batchAction = document.getElementById("batch_action")
   if (batchAction) {
     batchAction.value = this.dataset.action
   }
+
+  if (!event.target.dataset.confirm) { submitForm() }
 }
 
 const batchActionConfirmComplete = function(event) {
@@ -15,10 +24,7 @@ const batchActionConfirmComplete = function(event) {
     if (batchAction) {
       batchAction.value = this.dataset.action
     }
-    let form = document.getElementById("collection_selection")
-    if (form) {
-      form.submit()
-    }
+    submitForm()
   }
 }
 

data/app/views/active_admin/_main_navigation.html.erb

@@ -1,10 +1,10 @@
-<div id="main-menu" class="fixed top-0 xl:top-16 bottom-0 start-0 z-40 w-72 xl:w-60 p-4 overflow-y-auto transition-transform duration-200 -translate-x-full xl:translate-x-0 bg-white dark:bg-gray-950 xl:border-e xl:border-gray-200 xl:dark:border-white/10" tabindex="-1" aria-labelledby="drawer-navigation-label">
+<div id="main-menu" class="fixed top-0 xl:top-16 bottom-0 start-0 z-40 w-72 xl:w-60 p-4 overflow-y-auto transition-transform duration-200 -translate-x-full xl:translate-x-0 bg-white dark:bg-gray-950 xl:border-e xl:border-gray-200 xl:dark:border-white/10" tabindex="-1">
   <ul role="list" class="flex flex-1 flex-col space-y-1.5">
     <% current_menu.items(self).each do |item| %>
       <% children = item.items(self).presence %>
       <li <%= current_menu_item?(item) && "data-open" %> class="group" data-item-id="<%= item.id %>">
         <% if children %>
-          <button data-menu-button class="text-gray-600 hover:text-gray-900 dark:text-gray-400 dark:hover:text-white flex items-center w-full rounded-md p-2 gap-x-2 text-sm">
+          <button data-menu-button class="text-gray-600 hover:text-gray-900 dark:text-gray-400 dark:hover:text-white flex items-center w-full rounded-md p-2 gap-x-2 text-sm" aria-label="<%= t('active_admin.toggle_section') %>">
             <%= item.label(self) %>
             <svg class="group-data-[open]:rotate-90 group-data-[open]:rtl:-rotate-90 ms-auto h-5 w-5 shrink-0 rtl:-scale-x-100" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
               <path fill-rule="evenodd" d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" />

data/app/views/active_admin/_site_header.html.erb

@@ -1,5 +1,5 @@
 <div class="border-b border-gray-200 dark:border-white/10 dark:bg-gray-950/75 px-4 py-2 flex items-center sticky top-0 z-20 h-16 w-full backdrop-blur-md">
-  <button class="xl:hidden pe-3 inline-flex items-center w-8 h-8 justify-center text-sm text-gray-500 dark:text-gray-400 focus-visible:outline-none focus-visible:ring-ring focus-visible:bg-transparent focus-visible:ring-0 focus-visible:ring-offset-0" data-drawer-target="main-menu" data-drawer-show="main-menu" aria-controls="drawer-navigation">
+  <button class="xl:hidden pe-3 inline-flex items-center w-8 h-8 justify-center text-sm text-gray-500 dark:text-gray-400 focus-visible:outline-none focus-visible:ring-ring focus-visible:bg-transparent focus-visible:ring-0 focus-visible:ring-offset-0" data-drawer-target="main-menu" data-drawer-show="main-menu" aria-controls="main-menu" aria-label="<%= t('active_admin.toggle_main_navigation_menu') %>">
     <svg class="w-5 h-5 text-gray-800 dark:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 17 14"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 1h15M1 7h15M1 13h15"/></svg>
   </button>
 
@@ -9,12 +9,12 @@
     </h1>
   </div>
 
-  <button type="button" class="dark-mode-toggle flex items-center w-9 h-9 justify-center me-1 text-gray-400 hover:text-gray-500 dark:text-gray-500 dark:hover:text-gray-400 focus:outline-none text-sm">
+  <button type="button" class="dark-mode-toggle flex items-center w-9 h-9 justify-center me-1 text-gray-400 hover:text-gray-500 dark:text-gray-500 dark:hover:text-gray-400 focus:outline-none text-sm" aria-label="<%= t('active_admin.toggle_dark_mode') %>">
     <svg class="hidden dark:block w-5 h-5 rtl:-scale-x-100" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 18 20"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8.509 5.75c0-1.493.394-2.96 1.144-4.25h-.081a8.5 8.5 0 1 0 7.356 12.746A8.5 8.5 0 0 1 8.509 5.75Z"/></svg>
     <svg class="dark:hidden w-5 h-5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20"><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 3V1m0 18v-2M5.05 5.05 3.636 3.636m12.728 12.728L14.95 14.95M3 10H1m18 0h-2M5.05 14.95l-1.414 1.414M16.364 3.636 14.95 5.05M14 10a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z"/></svg>
   </button>
 
-  <button id="user-menu-button" class="flex items-center w-9 h-9 justify-center text-sm text-gray-500 focus:outline-none dark:text-gray-200" data-dropdown-toggle="user-menu" data-dropdown-offset-distance="3" data-dropdown-placement="bottom-end">
+  <button id="user-menu-button" class="flex items-center w-9 h-9 justify-center text-sm text-gray-500 focus:outline-none dark:text-gray-200" data-dropdown-toggle="user-menu" data-dropdown-offset-distance="3" data-dropdown-placement="bottom-end" aria-label="<%= t('active_admin.toggle_user_menu') %>">
     <svg class="w-7 h-7" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20"><path d="M10 0a10 10 0 1 0 10 10A10.011 10.011 0 0 0 10 0Zm0 5a3 3 0 1 1 0 6 3 3 0 0 1 0-6Zm0 13a8.949 8.949 0 0 1-4.951-1.488A3.987 3.987 0 0 1 9 13h2a3.987 3.987 0 0 1 3.951 3.512A8.949 8.949 0 0 1 10 18Z"/></svg>
   </button>
 

data/app/views/active_admin/kaminari/_next_page.html.erb

@@ -8,7 +8,7 @@
 -%>
 <% unless current_page.last? %>
   <%= link_to url, rel: 'next', remote: remote, class: "flex items-center justify-center px-2.5 py-3 h-8 leading-tight text-gray-500 dark:text-gray-400 hover:bg-gray-100 hover:text-gray-700 dark:hover:bg-gray-800 dark:hover:text-white rounded no-underline" do %>
-    <span class="sr-only"><%= t('views.pagination.next').html_safe %></span>
+    <span class="sr-only"><%= t('active_admin.pagination.next') %></span>
     <svg class="w-2.5 h-2.5 rtl:rotate-180" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 6 10">
       <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 9 4-4-4-4"/>
     </svg>

data/app/views/active_admin/kaminari/_prev_page.html.erb

@@ -8,7 +8,7 @@
 -%>
 <% unless current_page.first? %>
   <%= link_to url, rel: 'prev', remote: remote, class: "flex items-center justify-center px-2.5 py-3 h-8 leading-tight text-gray-500 dark:text-gray-400 hover:bg-gray-100 hover:text-gray-700 dark:hover:bg-gray-800 dark:hover:text-white rounded no-underline" do %>
-    <span class="sr-only"><%= t('views.pagination.previous').html_safe %></span>
+    <span class="sr-only"><%= t('active_admin.pagination.previous') %></span>
     <svg class="w-2.5 h-2.5 rtl:rotate-180" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 6 10">
       <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 1 1 5l4 4"/>
     </svg>

data/app/views/active_admin/resource/index.html.arb

@@ -58,7 +58,7 @@ def build_index_list
   end
 end
 
-# Returns the actual class for renderering the main content on the index
+# Returns the actual class for rendering the main content on the index
 # page. To set this, use the :as option in the page_presenter block.
 def find_index_renderer_class(klass)
   if klass.is_a?(Class)

data/config/importmap.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 pin "flowbite", preload: true # downloaded from https://cdnjs.cloudflare.com/ajax/libs/flowbite/2.2.1/flowbite.min.js
-pin "@rails/ujs", to: "https://ga.jspm.io/npm:@rails/ujs@7.1.2/app/assets/javascripts/rails-ujs.esm.js", preload: true
+pin "@rails/ujs", to: "rails_ujs_esm.js", preload: true # downloaded from https://cdn.jsdelivr.net/npm/@rails/ujs@7.1.2/+esm
 pin "active_admin", to: "active_admin.js", preload: true
 pin_all_from File.expand_path("../app/javascript/active_admin", __dir__), under: "active_admin", preload: true

data/config/locales/ca.yml

@@ -1,10 +1,27 @@
 ca:
+  activerecord:
+    models:
+      comment:
+        one: "Comentari"
+        other: "Comentaris"
+      active_admin/comment:
+        one: "Comentari"
+        other: "Comentaris"
+    attributes:
+      active_admin/comment:
+        author_type: "Tipus d'autor"
+        body: "Missatge"
+        created_at: "Creat el"
+        namespace: "Espai de noms"
+        resource_type: "Tipus de recurs"
+        updated_at: "Actualitzat el"
   active_admin:
-    dashboard: Tauler
+    dashboard: "Tauler d'activitat"
     view: "Mostra"
     edit: "Edita"
     delete: "Elimina"
-    delete_confirmation: "Segur que vols eliminar-ho?"
+    delete_confirmation: "Segur que voleu eliminar-ho?"
+    create_another: "Crear un altre %{model}"
     new_model: "Crear %{model}"
     edit_model: "Editar %{model}"
     delete_model: "Eliminar %{model}"
@@ -14,27 +31,41 @@ ca:
     previous: "Anterior"
     next: "Següent"
     download: "Descarregar:"
-    has_many_new: "Afegir %{model}"
+    has_many_new: "Afegir un altre %{model}"
     has_many_delete: "Eliminar"
     has_many_remove: "Treure"
+    move: "Moure"
     filters:
       buttons:
-        filter: "Filtrar"
-        clear: "Treure filtres"
+        filter: "Filtra"
+        clear: "Elimina els filtres"
+      predicates:
+        from: "Des de"
+        to: "Fins"
+    scopes:
+      all: "Tots"
+    search_status:
+      title: "Cerca activa"
+      title_with_scope: "Cerca activa per %{name}"
+      no_current_filters: "Sense filtres actius"
     status_tag:
       "yes": "Sí"
       "no": "No"
-      "unset": "No"
-    logout: "Desconnecta't"
+      "unset": "Desconegut"
+    logout: "Tanca la sessió"
     powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "Filtres"
+      search_status: "Estat de la cerca"
     pagination:
-      empty: "No hi ha %{model}"
-      one: "S'està mostrant <b>1</b> %{model}"
-      one_page: "S'estan mostrant <b>tots %{n}</b> %{model}"
-      multiple: "S'estan mostrant %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> de <b>%{total}</b> en total"
-      multiple_without_total: "S'estan mostrant %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b>"
+      empty: "No s'ha trobat cap %{model}"
+      one: "S'està mostrant <b>1</b> de <b>1</b>"
+      one_page: "S'estan mostrant <b>tots %{n}</b>"
+      multiple: "Se n'estan mostrant <b>%{from}-%{to}</b> d'un total de <b>%{total}</b>"
+      multiple_without_total: "Se n'estan mostrant <b>%{from}-%{to}</b>"
+      per_page: "Per pàgina"
+      previous: "Anterior"
+      next: "Següent"
       entry:
         one: "entrada"
         other: "entrades"
@@ -43,36 +74,55 @@ ca:
       content: "Encara no hi ha cap %{resource_name}."
       link: "Crea'n un/a"
     batch_actions:
-      button_label: "les accions per lots"
-      default_confirmation: "¿Esteu segur que voleu fer-ho?"
-      delete_confirmation: "¿Està segur que desitja eliminar aquests %{plural_model}?"
+      button_label: "Accions per lots"
+      default_confirmation: "Segur que voleu fer-ho?"
+      delete_confirmation: "Segurs que voleu eliminar aquests %{plural_model}?"
       succesfully_destroyed:
-        one: "Va destruir amb èxit 1 %{model}"
-        other: "Va destruir amb èxit %{count} %{plural_model}"
-      selection_toggle_explanation: "(Selecció de Canviar)"
+        one: "1 %{model} eliminat"
+        other: "%{count} %{plural_model} eliminats"
+      selection_toggle_explanation: "(Invertir la selecció)"
       action_label: "%{title} seleccionat"
       labels:
-        destroy: "esborrar"
+        destroy: "Esborrar"
     comments:
-      body: "Cos"
-      author: "autor"
+      created_at: "Creat el"
+      resource_type: "Tipus de recurs"
+      author_type: "Tipus d'author"
+      body: "Missatge"
+      author: "Autor"
       add: "Afegeix comentari"
+      delete: "Elimina comentari"
+      delete_confirmation: "Esteu segurs que voleu eliminar aquest comentari?"
       resource: "Recurs"
-      no_comments_yet: "No hi ha comentaris"
-      title_content: "comentaris (%{count})"
+      no_comments_yet: "Sense comentaris"
+      author_missing: "Anònim"
+      title_content: "Tots els comentaris (%{count})"
       errors:
-        empty_text: "El comentari no es va salvar, el text estava buida."
+        empty_text: "El comentari no s'ha desat, no hi havia text."
     devise:
+      username:
+        title: "Usuari"
+      email:
+        title: "Email"
+      subdomain:
+        title: "Subdomini"
+      password:
+        title: "Contrasenya"
+      password_confirmation:
+        title: "Confirmeu la contrasenya"
+      sign_up:
+        title: "Doneu-vos d'alta"
+        submit: "Doneu-vos d'alta"
       login:
-        title: "iniciar sessió"
-        remember_me: "Recordar"
-        submit: "iniciar sessió"
+        title: "Identifiqueu-vos"
+        remember_me: "Recorda'm"
+        submit: "Identifiqueu-vos"
       reset_password:
-        title: "Heu perdut la contrasenya?"
+        title: "Heu oblidat la contrasenya?"
         submit: "Restablir la contrasenya"
       change_password:
         title: "Canvieu la contrasenya"
-        submit: "Canviar la contrasenya"
+        submit: "Canvia'm la contrasenya"
       unlock:
         title: "Reenvia instruccions per a desbloquejar"
         submit: "Reenvia instruccions per a desbloquejar"
@@ -80,10 +130,13 @@ ca:
         title: "Reenviar instruccions de confirmació"
         submit: "Reenviar instruccions de confirmació"
       links:
-        sign_in: "Registrar"
+        sign_up: "Sign up"
+        sign_in: "Sign in"
         forgot_your_password: "Heu perdut la contrasenya?"
-        sign_in_with_omniauth_provider: "Connecta't amb %{provider}"
+        sign_in_with_omniauth_provider: "Identificació via %{provider}"
+        resend_unlock_instructions: "Reenviar les instruccions de desbloqueig"
+        resend_confirmation_instructions: "Reenviar les instruccions de confirmació"
     access_denied:
-      message: "No esta autoritzat a realitzar aquesta acció."
+      message: "No esteu autoritzats a realitzar aquesta acció"
     index_list:
       table: "Taula"

data/config/locales/de.yml

@@ -16,7 +16,7 @@ de:
         resource_type: "Ressourcentyp"
         updated_at: "Aktualisiert"
   active_admin:
-    dashboard: Übersicht
+    dashboard: "Übersicht"
     view: "Anzeigen"
     edit: "Bearbeiten"
     delete: "Löschen"
@@ -34,7 +34,7 @@ de:
     has_many_new: "%{model} hinzufügen"
     has_many_delete: "Löschen"
     has_many_remove: "Entfernen"
-    move: "Bewegen"
+    move: "Verschieben"
     filters:
       buttons:
         filter: "Filtern"
@@ -45,6 +45,8 @@ de:
     scopes:
       all: "Alle"
     search_status:
+      title: "Aktive Filter"
+      title_with_scope: "Aktive Filter in %{name}"
       no_current_filters: "Keine"
     status_tag:
       "yes": "Ja"
@@ -54,14 +56,16 @@ de:
     powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "Filter"
-      search_status: "Suchstatus"
+      search_status: "Aktive Filter"
     pagination:
       empty: "Keine %{model} gefunden"
-      one: "Zeige <b>1</b> %{model}"
-      one_page: "Zeige <b>alle %{n}</b> %{model}"
-      multiple: "Zeige %{model} <b>%{from}&nbsp;–&nbsp;%{to}</b> von <b>%{total}</b>"
-      multiple_without_total: "Zeige %{model} <b>%{from}&nbsp;–&nbsp;%{to}</b>"
+      one: "<b>1</b> %{model}"
+      one_page: "<b>Alle %{n}</b> %{model}"
+      multiple: "%{model} <b>%{from}&nbsp;–&nbsp;%{to}</b> von <b>%{total}</b>"
+      multiple_without_total: "%{model} <b>%{from}&nbsp;–&nbsp;%{to}</b>"
       per_page: "Pro Seite: "
+      previous: "Vorherige"
+      next: "Nächste"
       entry:
         one: "Eintrag"
         other: "Einträge"
@@ -71,15 +75,15 @@ de:
       link: "Erstellen"
     batch_actions:
       button_label: "Stapelverarbeitung"
-      default_confirmation: "Bist du sicher, dass Sie dies tun wollen?"
-      delete_confirmation: "Sind Sie sicher dass sie diese %{plural_model} löschen wollen?"
+      default_confirmation: "Sind Sie sicher?"
+      delete_confirmation: "Sind Sie sicher dass Sie diese %{plural_model} löschen wollen?"
       succesfully_destroyed:
         one: "Erfolgreich 1 %{model} gelöscht"
         other: "Erfolgreich %{count} %{plural_model} gelöscht"
       selection_toggle_explanation: "(Auswahl umschalten)"
-      action_label: "%{title} ausgewählte"
+      action_label: "Ausgewählte %{title}"
       labels:
-        destroy: "Lösche"
+        destroy: "löschen"
     comments:
       created_at: "Erstellt"
       resource_type: "Res­sour­cen-Typ"
@@ -88,7 +92,7 @@ de:
       author: "Autor"
       add: "Kommentar hinzufügen"
       delete: "Löschen"
-      delete_confirmation: "Sind Sie sicher dass sie diesen Kommentar löschen wollen?"
+      delete_confirmation: "Sind Sie sicher dass Sie diesen Kommentar löschen wollen?"
       resource: "Res­sour­ce"
       no_comments_yet: "Es gibt noch keine Kommentare."
       author_missing: "Unbekannt"

data/config/locales/en.yml

@@ -1,8 +1,4 @@
 en:
-  views:
-    pagination:
-      previous: "Previous"
-      next: "Next"
   activerecord:
     models:
       comment:
@@ -56,6 +52,10 @@ en:
       "yes": "Yes"
       "no": "No"
       "unset": "Unknown"
+    toggle_dark_mode: Toggle dark mode
+    toggle_main_navigation_menu: Toggle main navigation menu
+    toggle_section: Toggle section
+    toggle_user_menu: Toggle user menu
     logout: "Sign out"
     powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
@@ -68,6 +68,8 @@ en:
       multiple: "Showing <b>%{from}-%{to}</b> of <b>%{total}</b>"
       multiple_without_total: "Showing <b>%{from}-%{to}</b>"
       per_page: "Per page "
+      previous: "Previous"
+      next: "Next"
       entry:
         one: "entry"
         other: "entries"

data/config/locales/fr.yml

@@ -1,8 +1,4 @@
 fr:
-  views:
-    pagination:
-      previous: "Précédent"
-      next: "Suivant"
   activerecord:
     models:
       comment:
@@ -65,6 +61,8 @@ fr:
       multiple: "Affichage de <b>%{from}-%{to}</b> sur <b>%{total}</b>"
       multiple_without_total: "Affichage de <b>%{from}-%{to}</b>"
       per_page: "Par page "
+      previous: "Précédent"
+      next: "Suivant"
       entry:
         one: "entrée"
         other: "entrées"

data/config/locales/it.yml

@@ -45,23 +45,31 @@ it:
     scopes:
       all: "Tutti"
     search_status:
-      no_current_filters: "Nessuno"
+      title: "Ricerca corrente"
+      title_with_scope: "Ricerca corrente per %{name}"
+      no_current_filters: "Nessun filtro applicato"
     status_tag:
       "yes": "Sì"
       "no": "No"
-      "unset": "No"
+      "unset": "Vuoto"
+    toggle_dark_mode: Attiva/Disattiva tema scuro
+    toggle_main_navigation_menu: Espandi/Riduci menu di navigazione principale
+    toggle_section: Espandi/Riduci sezione
+    toggle_user_menu: Espandi/Riduci menu utente
     logout: "Esci"
     powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "Filtri"
       search_status: "Informazioni sulla ricerca"
     pagination:
-      empty: "Nessun %{model} trovato"
-      one: "Sto mostrando <b>1</b> %{model}"
-      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>"
+      empty: "Nessun risultato per %{model}"
+      one: "Mostrando <b>1</b> di <b>1</b>"
+      one_page: "Mostrando <b>%{n}</b> %{model}. Lista completa."
+      multiple: "Mostrando <b>%{from}-%{to}</b> di <b>%{total}</b>"
+      multiple_without_total: "Mostrando <b>%{from}-%{to}</b>"
       per_page: "Oggetti per pagina: "
+      previous: "Precedente"
+      next: "Successiva"
       entry:
         one: "voce"
         other: "voci"

data/config/locales/nl.yml

@@ -1,8 +1,4 @@
 nl:
-  views:
-    pagination:
-      previous: "Vorige"
-      next: "Volgende"
   active_admin:
     dashboard: Dashboard
     view: "Bekijk"
@@ -52,6 +48,8 @@ nl:
       multiple: "Toont <b>%{from}-%{to}</b> van <b>%{total}</b>"
       multiple_without_total: "Toont <b>%{from}-%{to}</b>"
       per_page: "Per pagina: "
+      previous: "Vorige"
+      next: "Volgende"
       entry:
         one: "entry"
         other: "entries"

data/config/locales/zh-CN.yml

@@ -45,6 +45,8 @@
     scopes:
       all: "所有"
     search_status:
+      title: "搜索条件"
+      title_with_scope: "搜索条件 %{name}"
       no_current_filters: "无"
     status_tag:
       "yes": "是"
@@ -62,6 +64,8 @@
       multiple: "显示所有 <b>%{total}</b> %{model}中的<b>%{from}&nbsp;-&nbsp;%{to}</b> 条"
       multiple_without_total: "%{model}中的<b>%{from}&nbsp;-&nbsp;%{to}</b> 条"
       per_page: "每页："
+      previous: "上一页"
+      next: "下一页"
       entry:
         one: "条目"
         other: "条目"