activeadmin 2.4.0 → 2.14.0

data/app/{assets/javascripts/active_admin/lib/checkbox-toggler.es6 → javascript/active_admin/lib/checkbox-toggler.js}

@@ -1,4 +1,4 @@
-ActiveAdmin.CheckboxToggler = class CheckboxToggler {
+class CheckboxToggler {
   constructor(options, container){
     this.options = options;
     this.container = container;
@@ -6,7 +6,7 @@ ActiveAdmin.CheckboxToggler = class CheckboxToggler {
     this._bind();
   }
 
-  option(key, value) {
+  option(_key, _value) {
   }
 
   _init() {
@@ -30,7 +30,7 @@ ActiveAdmin.CheckboxToggler = class CheckboxToggler {
     this.toggle_all_checkbox.change(() => this._didChangeToggleAllCheckbox());
   }
 
-  _didChangeCheckbox(checkbox){
+  _didChangeCheckbox(_checkbox){
     const numChecked = this.checkboxes.filter(':checked').length;
 
     const allChecked = numChecked === this.checkboxes.length;
@@ -44,6 +44,6 @@ ActiveAdmin.CheckboxToggler = class CheckboxToggler {
     this.checkboxes.prop({ checked: setting });
     return setting;
   }
-};
+}
 
-$.widget.bridge('checkboxToggler', ActiveAdmin.CheckboxToggler);
+export default CheckboxToggler;

data/app/{assets/javascripts/active_admin/lib/dropdown-menu.es6 → javascript/active_admin/lib/dropdown-menu.js}

@@ -1,5 +1,4 @@
-ActiveAdmin.DropdownMenu = class DropdownMenu {
-
+class DropdownMenu {
   constructor(options, element) {
     this.options = options;
     this.element = element;
@@ -112,12 +111,6 @@ ActiveAdmin.DropdownMenu = class DropdownMenu {
       this.$nipple.css('left', menu_center - nipple_center);
     }
   }
-};
-
-$.widget.bridge('aaDropdownMenu', ActiveAdmin.DropdownMenu);
-
-const onDOMReady = () => $('.dropdown_menu').aaDropdownMenu();
+}
 
-$(document).
-  ready(onDOMReady).
-  on('page:load turbolinks:load', onDOMReady);
+export default DropdownMenu;

data/app/javascript/active_admin/lib/filters.js

@@ -0,0 +1,39 @@
+import { queryStringToParams, hasTurbolinks, turbolinksVisit, toQueryString } from '../lib/utils';
+
+class Filters {
+
+  static _clearForm(event) {
+    const regex = /^(q\[|q%5B|q%5b|page|utf8|commit)/;
+    const params = queryStringToParams()
+      .filter(({name}) => !name.match(regex));
+
+    event.preventDefault();
+
+    if (hasTurbolinks()) {
+      turbolinksVisit(params);
+    } else {
+      window.location.search = toQueryString(params);
+    }
+  }
+
+  static _disableEmptyInputFields(event) {
+    const params = $(this)
+      .find(':input')
+      .filter((i, input) => input.value === '')
+      .prop({ disabled: true })
+      .end()
+      .serializeArray();
+
+    if (hasTurbolinks()) {
+      event.preventDefault();
+      turbolinksVisit(params);
+    }
+  }
+
+  static _setSearchType() {
+    $(this).siblings('input').prop({name: `q[${this.value}]`});
+  }
+
+}
+
+export default Filters;

data/app/{assets/javascripts/active_admin/lib/modal_dialog.es6 → javascript/active_admin/lib/modal-dialog.js}

@@ -1,14 +1,14 @@
-ActiveAdmin.modal_dialog = function(message, inputs, callback){
+function ModalDialog(message, inputs, callback){
   let html = `<form id="dialog_confirm" title="${message}"><ul>`;
   for (let name in inputs) {
-    var elem, opts, wrapper;
+    var opts, wrapper;
     let type = inputs[name];
     if (/^(datepicker|checkbox|text|number)$/.test(type)) {
       wrapper = 'input';
     } else if (type === 'textarea') {
       wrapper = 'textarea';
     } else if ($.isArray(type)) {
-      [wrapper, elem, opts, type] = ['select', 'option', type, ''];
+      [wrapper, opts, type] = ['select', type, ''];
     } else {
       throw new Error(`Unsupported input type: {${name}: ${type}}`);
     }
@@ -21,20 +21,20 @@ ActiveAdmin.modal_dialog = function(message, inputs, callback){
           const result = [];
 
           opts.forEach(v => {
-            const $elem = $(`<${elem}/>`);
+            const $elem = $('<option></option>');
             if ($.isArray(v)) {
               $elem.text(v[0]).val(v[1]);
             } else {
               $elem.text(v);
             }
-            result.push($elem.wrap('<div>').parent().html());
+            result.push($elem.wrap('<div></div>').parent().html());
           });
 
           return result;
         })()).join('') : '') +
       `</${wrapper}>` +
     "</li>";
-    [wrapper, elem, opts, type, klass] = []; // unset any temporary variables
+    [wrapper, opts, type, klass] = []; // unset any temporary variables
   }
 
   html += "</ul></form>";
@@ -44,7 +44,7 @@ ActiveAdmin.modal_dialog = function(message, inputs, callback){
 
   form.dialog({
     modal: true,
-    open(event, ui) {
+    open(_event, _ui) {
       $('body').trigger('modal_dialog:after_open', [form]);
     },
     dialogClass: 'active_admin_dialog',
@@ -58,4 +58,6 @@ ActiveAdmin.modal_dialog = function(message, inputs, callback){
       }
     }
   });
-};
+}
+
+export default ModalDialog;

data/app/javascript/active_admin/lib/per-page.js

@@ -0,0 +1,38 @@
+import { queryStringToParams, hasTurbolinks, turbolinksVisit, toQueryString } from './utils';
+
+class PerPage {
+  constructor(element) {
+    this.element = element;
+  }
+
+  update() {
+    const params = queryStringToParams()
+      .filter(({name}) => name != 'per_page' || name != 'page')
+
+    params.push({ name: 'per_page', value: this.element.value });
+
+    if (hasTurbolinks()) {
+      turbolinksVisit(params);
+    } else {
+      window.location.search = toQueryString(params);
+    }
+  }
+
+  static _jQueryInterface(config) {
+    return this.each(function () {
+      const $this = $(this)
+      let data = $this.data('perPage')
+
+      if (!data) {
+        data = new PerPage(this)
+        $this.data('perPage', data)
+      }
+
+      if (config === 'update') {
+        data[config]()
+      }
+    })
+  }
+}
+
+export default PerPage;

data/app/{assets/javascripts/active_admin/lib/table-checkbox-toggler.es6 → javascript/active_admin/lib/table-checkbox-toggler.js}

@@ -1,4 +1,6 @@
-ActiveAdmin.TableCheckboxToggler = class TableCheckboxToggler extends ActiveAdmin.CheckboxToggler {
+import CheckboxToggler from "./checkbox-toggler";
+
+class TableCheckboxToggler extends CheckboxToggler {
   _bind() {
     super._bind(...arguments);
 
@@ -31,6 +33,6 @@ ActiveAdmin.TableCheckboxToggler = class TableCheckboxToggler extends ActiveAdmi
       .find(':checkbox')
       .click();
   }
-};
+}
 
-$.widget.bridge('tableCheckboxToggler', ActiveAdmin.TableCheckboxToggler);
+export default TableCheckboxToggler;

data/app/javascript/active_admin/lib/utils.js

@@ -0,0 +1,40 @@
+function hasTurbolinks() {
+  return (typeof Turbolinks !== 'undefined' && Turbolinks.supported);
+}
+
+function turbolinksVisit(params) {
+  const path = [window.location.pathname, '?', toQueryString(params)].join('')
+  Turbolinks.visit(path);
+}
+
+function queryString() {
+  return (window.location.search || '').replace(/^\?/, '');
+}
+
+function queryStringToParams() {
+  const decode = (value) => decodeURIComponent((value || '').replace(/\+/g, '%20'));
+
+  return queryString()
+    .split("&")
+    .map(pair => pair.split("="))
+    .map(([key, value]) => {
+      return { name: decode(key), value: decode(value) }
+    });
+}
+
+function toQueryString(params) {
+  const encode = (value) => encodeURIComponent(value || '');
+
+  return params
+    .map(({name, value}) => [ encode(name), encode(value) ])
+    .map(pair => pair.join('='))
+    .join('&')
+}
+
+export {
+  hasTurbolinks,
+  turbolinksVisit,
+  queryString,
+  queryStringToParams,
+  toQueryString
+};

data/app/views/active_admin/devise/mailer/reset_password_instructions.html.erb

@@ -2,7 +2,7 @@
 
 <p>Someone has requested a link to change your password, and you can do this through the link below.</p>
 
-<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @resource.reset_password_token) %></p>
+<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
 
 <p>If you didn't request this, please ignore this email.</p>
 <p>Your password won't change until you access the link above and create a new one.</p>

data/app/views/active_admin/devise/mailer/unlock_instructions.html.erb

@@ -1,7 +1,7 @@
 <p>Hello <%= @resource.email %>!</p>
 
-<p>Your account has been locked due to an excessive amount of unsuccessful sign in attempts.</p>
+<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
 
 <p>Click the link below to unlock your account:</p>
 
-<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @resource.unlock_token) %></p>
+<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>

data/app/views/active_admin/devise/shared/_links.erb

@@ -27,7 +27,7 @@
 <%- if devise_mapping.omniauthable? %>
   <%- resource_class.omniauth_providers.each do |provider| %>
     <%= link_to t('active_admin.devise.links.sign_in_with_omniauth_provider', provider: provider.to_s.titleize),
-          omniauth_authorize_path(resource_name, provider) %>
+          omniauth_authorize_path(resource_name, provider), method: :post %>
     <br>
   <% end -%>
 <% end -%>

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

@@ -1 +1,2 @@
+# frozen_string_literal: true
 insert_tag active_admin_application.view_factory["page"]

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

@@ -1 +1,2 @@
+# frozen_string_literal: true
 insert_tag renderer_for(:edit)

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

@@ -1 +1,2 @@
+# frozen_string_literal: true
 insert_tag renderer_for(:index)

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

@@ -1 +1,2 @@
+# frozen_string_literal: true
 insert_tag renderer_for(:new)

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

@@ -1 +1,2 @@
+# frozen_string_literal: true
 insert_tag renderer_for(:show)

data/app/views/layouts/active_admin.html.arb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 insert_tag view_factory.layout

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 %>
+  <% ActiveAdmin.application.javascripts.each do |path, options| %>
+    <% if ActiveAdmin.application.use_webpacker %>
+      <%= javascript_pack_tag path, **options %>
+    <% else %>
+      <%= javascript_include_tag path, **options %>
+    <% end %>
   <% end %>
 
   <%= favicon_link_tag ActiveAdmin.application.favicon if ActiveAdmin.application.favicon %>
@@ -18,15 +26,18 @@
     <%= tag(:meta, name: name, content: content) %>
   <% end %>
 
-  <%= csrf_meta_tag %>
+  <%= csrf_meta_tags %>
+  <%= csp_meta_tag %>
 </head>
 <body class="active_admin logged_out <%= controller.action_name %>">
 <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/ar.yml

@@ -8,7 +8,7 @@ ar:
     edit: "تعديل"
     delete: "حذف"
     delete_confirmation: "هل تريد تأكيد الحذف؟"
-    new_model: "جديد %{model}"
+    new_model: "%{model} جديد"
     edit_model: "تعديل %{model}"
     delete_model: "حذف %{model}"
     details: "تفاصيل %{model}"
@@ -97,12 +97,12 @@ ar:
       password:
         title: "كلمة المرور"
       sign_up:
-        title: "تسجيل الدخول"
-        submit: "تسجيل الدخول"
+        title: "تسجيل"
+        submit: "تسجيل"
       login:
-        title: "دخول"
+        title: "تسجيل الدخول"
         remember_me: "تذكرني"
-        submit: "تسحيل"
+        submit: "تسجيل الدخول"
       reset_password:
         title: "هل نسيت كلمة المرور؟"
         submit: "استرجاع كلمة المرور"
@@ -117,7 +117,7 @@ ar:
         submit: "إعادة ارسال تعليمات التأكيد"
       links:
         sign_up: "التسجيل"
-        sign_in: "دخول"
+        sign_in: "تسجيل الدخول"
         forgot_your_password: "هل نسيت كلمة المرور؟"
         sign_in_with_omniauth_provider: "تسجيل الدخول بـ %{provider}"
         resend_unlock_instructions: "إعادة إرسال تعليمات تنشيط الحساب"

data/config/locales/az.yml

@@ -0,0 +1,138 @@
+az:
+  active_admin:
+    dashboard: "İdarəetmə paneli"
+    dashboard_welcome:
+      welcome: "Active Admin-ə xoş gəlmişsiniz. Bu saytla idarəetmənin standart səhifəsidir."
+      call_to_action: "Buraya nə isə əlavə etmək üçün 'app/admin/dashboard.rb' sənədini dəyişin"
+    view: "Aç"
+    edit: "Dəyiş"
+    delete: "Sil"
+    delete_confirmation: "Siz bunu silmək istədiyinizdən əminsiniz?"
+    new_model: "%{model} yarat"
+    edit_model: "%{model} dəyiş"
+    delete_model: "%{model} sil"
+    details: "%{model} haqqında"
+    cancel: "İmtina"
+    empty: "Boş"
+    previous: "Geri"
+    next: "İrəli"
+    download: "Yüklənmə:"
+    has_many_new: "%{model} əlavə et"
+    has_many_delete: "Sil"
+    has_many_remove: "Yığışdır"
+    filters:
+      buttons:
+        filter: "Filtrlə"
+        clear: "Təmizlə"
+      predicates:
+        contains: "Yerləşir"
+        equals: "Bərabərdir"
+        starts_with: "Başlayır"
+        ends_with: "Bitir"
+        greater_than: "böyük"
+        less_than: "kiçik"
+    search_status:
+      headline: "Axtarışın statusu:"
+      current_scope: "Sahə:"
+      current_filters: "Cari filter:"
+      no_current_filters: "Heç biri"
+    status_tag:
+      "yes": "Bəli"
+      "no": "Xeyr"
+    main_content: "Создайте %{model}#main_content для отображения содержимого."
+    logout: "Çıxış"
+    powered_by: "Работает на %{active_admin} %{version}"
+    sidebars:
+      filters: "Filterlə"
+      search_status: "Axtarışın statusu"
+    pagination:
+      empty: "%{model} tapılmadı"
+      one: "Nəticə: <b>1</b> %{model}"
+      one_page: "Nəticə: <b>%{n}</b> %{model}"
+      multiple: "Nəticə: %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> <b>%{total}</b>"
+      multiple_without_total: "Nəticə: %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b>"
+      entry:
+        one: "yazı"
+        few: "yazı"
+        many: "yazı"
+        other: "yazı"
+    any: "İstənilən"
+    blank_slate:
+      content: "%{resource_name} hələ yoxdur."
+      link: "Yarat"
+    dropdown_actions:
+      button_label: "Əməliyyatlar"
+    batch_actions:
+      button_label: "Qrup əməliyyatları"
+      default_confirmation: "Siz bunu etməyinizə əminsiniz?"
+      delete_confirmation: "Siz %{plural_model} silməyə əminsiniz?"
+      succesfully_destroyed:
+        one: "Uğurla silindi: 1 %{model}"
+        few: "Uğurla silindi: %{count} %{plural_model}"
+        many: "Uğurla silindi: %{count} %{plural_model}"
+        other: "Uğurla silindi: %{count} %{plural_model}"
+      selection_toggle_explanation: "(Hamısını seç / Seçilmişləri sıfırla)"
+      action_label: "%{title} seçilmiş"
+      labels:
+        destroy: "Sil"
+    comments:
+      created_at: "Yaranma tarixi"
+      resource_type: "Resursun tipi"
+      author_type: "Müəllifin tipi"
+      body: "Mətn"
+      author: "Müəllif"
+      add: "Şərh əlavə et"
+      delete: "Şərhi sil"
+      delete_confirmation: "Siz bu şərhi silmək istədiyinizdən əminsiniz?"
+      resource: "Resurs"
+      no_comments_yet: "Hələ şərhlər yoxdur."
+      author_missing: "Naməlum"
+      title_content: "Şərhlər (%{count})"
+      errors:
+        empty_text: "Şərh yadda saxlanılmadı, mətn boş ola bilməz."
+    devise:
+      username:
+        title: "İstifadəçi adı"
+      email:
+        title: "E-poçt"
+      subdomain:
+        title: "Subdomen"
+      password:
+        title: "Şifrə"
+      sign_up:
+        title: "Qeydiyyat"
+        submit: "Qeydiyyatdan keç"
+      login:
+        title: "Giriş"
+        remember_me: "Məni yadda saxla"
+        submit: "Daxil ol"
+      reset_password:
+        title: "Şifrəni unutmusunuz?"
+        submit: "Şifrəni sıfırla"
+      change_password:
+        title: "Şifrənin dəyişdirilməsi"
+        submit: "Şifrəni dəyiş"
+      unlock:
+        title: "Blokdan çıxarma üzrə təlimatı yenidən göndərmək"
+        submit: "Blokdan çıxarma üzrə təlimatı yenidən göndərmək"
+      resend_confirmation_instructions:
+        title: "Aktivləşdirmə ismarışını yenidən göndərmək"
+        submit: "Aktivləşdirmə ismarışını yenidən göndərmək"
+      links:
+        sign_up: "Qeydiyyat"
+        sign_in: "Giriş"
+        forgot_your_password: "Şifrəni unutmusunuz?"
+        sign_in_with_omniauth_provider: "%{provider} vasitəsilə daxil ol"
+        resend_unlock_instructions: "Blokdan çıxarma üzrə təlimatı yenidən göndərilməsi"
+        resend_confirmation_instructions: "Aktivləşdirmə ismarışını yenidən göndərilməsi"
+    unsupported_browser:
+      headline: "Zəhmət olmasa, bilin ki, Active Admin artıq Internet Explorer-in köhnə versiyalarını daha dəstəkləmir və yalnız IE 8 versiyasından başlayaraq dəstəkləyir"
+      recommendation: "Biz sizin brauzerinizin versiyasını yeniləməyi məsləhət görürük (<a href=\"http://windows.microsoft.com/ie\">Internet Explorer</a>, <a href=\"https://chrome.google.com/\">Google Chrome</a>, və ya <a href=\"https://mozilla.org/firefox/\">Firefox</a>)."
+      turn_off_compatibility_view: "Əgər siz IE 9  və ya daha yeni versiya istifadə edirsinizsə, əmin olun ki, <a href=\"https://support.microsoft.com/ru-ru/help/17471\">\"Uyğunluğun rejimində baxış\"</a> seçimini söndürmüsünüz."
+    access_denied:
+      message: "Bunu etmək üçün daxil olmalısınız."
+    index_list:
+      table: "Cədvəl"
+      block: "Siyahı"
+      grid: "Tor"
+      blog: "Bloq"

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-MX.yml

@@ -86,7 +86,8 @@ es-MX:
         title: "Cambie su contraseña"
         submit: "Cambiar mi contraseña"
       links:
-        sign_in: "Registrarse"
+        sign_in: "Iniciar Sesión"
+        sign_up: "Registrarse"
         forgot_your_password: "¿Olvidó su contraseña?"
         sign_in_with_omniauth_provider: "Conéctate con %{provider}"
     index_list:

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"
@@ -143,8 +143,8 @@ es:
         title: "Reenviar instrucciones de confirmación"
         submit: "Reenviar instrucciones de confirmación"
       links:
-        sign_up: "Ingresar"
-        sign_in: "Registrarse"
+        sign_up: "Registrarse"
+        sign_in: "Iniciar Sesión"
         forgot_your_password: "¿Olvidó su contraseña?"
         sign_in_with_omniauth_provider: "Conéctate con %{provider}"
         resend_unlock_instructions: "Reenviar instrucciones de desbloqueo"