activeadmin 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a84a106c0900650dea61f07201b5917cd693955
-  data.tar.gz: cd12642360eba01bdd56347eca1afb8b7faf4b9f
+  metadata.gz: 13d4e946e40362654bc8af6e1e905e8c7a3a679d
+  data.tar.gz: bd8a87269036be0171e9731f4239cea4dd3ca667
 SHA512:
-  metadata.gz: 65e3bd10aeeba694b950408dea2e8cd2dc45cd498ab408094a091ec32212cf285fb80f7f4f897d8906e90ae084b0011cf17f02beb16312ce2ce241e0f1865417
-  data.tar.gz: 83d974c9f52817a78db747973fa862b9b203ae6ef7ab1c7df3e4c1b2a76b2a6dec1235e9428750571731e983bc7ccedf994270b3b75cf500594bd77776769d1f
+  metadata.gz: 6b0a1f546b0d811e928f3ca6e94972ea1742e8ec57e3e78b5cbc49535907be1097c27e1eb3ed779b8bacc5538a344c94b81aa368374edda389bf144ecffef995
+  data.tar.gz: 21e63c49e42e02777083b3a4ee1b7bb77ba63b11fefd894b25378f61ba2a3d51e66097e6cbc256d8877b61abf399c8f81a05c105bde672b7532c8ecbf09948a1

data/.travis.yml

@@ -8,10 +8,6 @@ dist: trusty
 
 bundler_args: --without development
 
-branches:
-  only:
-    - master
-
 cache: bundler
 
 before_install:
@@ -26,9 +22,9 @@ script:
 
 rvm:
   - jruby-9.1.12.0
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.2.8
+  - 2.3.5
+  - 2.4.2
 
 gemfile:
   - gemfiles/rails_42.gemfile
@@ -45,6 +41,8 @@ matrix:
   fast_finish: true
 
   allow_failures:
+    - rvm: jruby-9.1.12.0
+      gemfile: gemfiles/rails_42.gemfile
     - rvm: jruby-9.1.12.0
       gemfile: gemfiles/rails_50.gemfile
     - rvm: jruby-9.1.12.0

data/CHANGELOG.md

@@ -1,6 +1,34 @@
 # Changelog
 
-## ## 1.1.0 [☰](https://github.com/activeadmin/activeadmin/compare/v1.0.0...v1.1.0)
+## 1.2.0 [☰](https://github.com/activeadmin/activeadmin/compare/v1.1.0...v1.2.0)
+
+### Enhancements
+
+#### Minor
+
+* Do not display pagination info when there are no comments [#5119][] by [@alex-bogomolov][]
+* Revert generated config files to pluralized [#5120][] by [@varyonic][], [#5137][] by [@deivid-rodriguez][]
+* Warn when action definition overwrites controller method [#5167][] by [@aarek][]
+* Better performance of comments show view [#5208][] by [@dhyegofernando][]
+* Mitigate memory bloat [#4118][] with CSV exports [#5251][] by [@f1sherman][]
+* Fix issue applying custom decorations [#5253][] by [@faucct][]
+* Translations:
+  * Brazilian locale upated [#5125][] by [@renotocn][]
+  * Japanese locale updated [#5143][] by [@5t111111][], [#5157][] by [innparusu95][]
+  * Italian locale updated [#5180][] by [@blocknotes][]
+  * Swedish locale updated [#5187][] by [@jawa][]
+  * Vietnamese locale updated [#5194][] by [@Nguyenanh][]
+  * Esperanto locale added [#5210][] by [@RobinvanderVliet][]
+
+### Bug Fixes
+
+* Fix a couple of issues rendering filter labels [#5223][] by [@wspurgin][]
+* Prevent NameError when filtering on a namespaced association [#5240][] by [@DanielHeath][]
+* Fix undefined method error in Ransack when building filters [#5238][] by [@wspurgin][]
+* Fixed [#5198][] Prevent XSS on sidebar's current filter rendering [#5272][] by [@deivid-rodriguez][]
+* Sanitize display_name [#5284][] by [@markstory][].
+
+## 1.1.0 [☰](https://github.com/activeadmin/activeadmin/compare/v1.0.0...v1.1.0)
 
 ### Bug Fixes
 
@@ -13,8 +41,10 @@
 
 ### Removals
 
-* Ruby 2.1 support has been dropped [#5002][] by [@deivid-rodriguez][]
+* Ruby 2.1 support has been dropped [#5003][] by [@deivid-rodriguez][]
 * Replaced `sass-rails` with `sass` dependency [#5037][] by [@javierjulio][]
+* AA won't work properly with jQuery 1 & 2. Use jQuery 3 instead (`#= require jquery3`
+ in `active_admin.js.coffee`)
 
 ### Deprecations
 
@@ -172,10 +202,12 @@ Please check [0-6-stable](https://github.com/activeadmin/activeadmin/blob/0-6-st
 [#3731]: https://github.com/activeadmin/activeadmin/issues/3731
 [#3783]: https://github.com/activeadmin/activeadmin/issues/3783
 [#3894]: https://github.com/activeadmin/activeadmin/issues/3894
+[#4118]: https://github.com/activeadmin/activeadmin/issues/4118
 [#4187]: https://github.com/activeadmin/activeadmin/issues/4187
 [#4173]: https://github.com/activeadmin/activeadmin/issues/4173
 [#4254]: https://github.com/activeadmin/activeadmin/issues/4254
 [#5043]: https://github.com/activeadmin/activeadmin/issues/5043
+[#5198]: https://github.com/activeadmin/activeadmin/issues/5198
 
 [#4477]: https://github.com/activeadmin/activeadmin/pull/4477
 [#4759]: https://github.com/activeadmin/activeadmin/pull/4759
@@ -191,33 +223,60 @@ Please check [0-6-stable](https://github.com/activeadmin/activeadmin/blob/0-6-st
 [#4996]: https://github.com/activeadmin/activeadmin/pull/4996
 [#4997]: https://github.com/activeadmin/activeadmin/pull/4997
 [#5029]: https://github.com/activeadmin/activeadmin/pull/5029
-[#5002]: https://github.com/activeadmin/activeadmin/pull/5002
+[#5003]: https://github.com/activeadmin/activeadmin/pull/5003
 [#5037]: https://github.com/activeadmin/activeadmin/pull/5037
 [#5044]: https://github.com/activeadmin/activeadmin/pull/5044
 [#5046]: https://github.com/activeadmin/activeadmin/pull/5046
 [#5060]: https://github.com/activeadmin/activeadmin/pull/5060
 [#5069]: https://github.com/activeadmin/activeadmin/pull/5069
 [#5088]: https://github.com/activeadmin/activeadmin/pull/5088
-[#5093]: https://github.com/activeadmin/activeadmin/pull/5093 
-
+[#5093]: https://github.com/activeadmin/activeadmin/pull/5093
+[#5119]: https://github.com/activeadmin/activeadmin/pull/5119
+[#5120]: https://github.com/activeadmin/activeadmin/pull/5120
+[#5125]: https://github.com/activeadmin/activeadmin/pull/5125
+[#5137]: https://github.com/activeadmin/activeadmin/pull/5137
+[#5143]: https://github.com/activeadmin/activeadmin/pull/5143
+[#5167]: https://github.com/activeadmin/activeadmin/pull/5167
+[#5180]: https://github.com/activeadmin/activeadmin/pull/5180
+[#5187]: https://github.com/activeadmin/activeadmin/pull/5187
+[#5194]: https://github.com/activeadmin/activeadmin/pull/5194
+[#5208]: https://github.com/activeadmin/activeadmin/pull/5208
+[#5210]: https://github.com/activeadmin/activeadmin/pull/5210
+[#5251]: https://github.com/activeadmin/activeadmin/pull/5251
+[#5253]: https://github.com/activeadmin/activeadmin/pull/5253
+[#5272]: https://github.com/activeadmin/activeadmin/pull/5272
+[#5284]: https://github.com/activeadmin/activeadmin/pull/5284
+
+[@5t111111]: https://github.com/5t111111
+[@aarek]: https://github.com/aarek
 [@ajw725]: https://github.com/ajw725
+[@alex-bogomolov]: https://github.com/alex-bogomolov
 [@bolshakov]: https://github.com/bolshakov
+[@blocknotes]: https://github.com/blocknotes
 [@chancancode]: https://github.com/chancancode
 [@craigmcnamara]: https://github.com/craigmcnamara
 [@deivid-rodriguez]: https://github.com/deivid-rodriguez
+[@dhyegofernando]: https://github.com/dhyegofernando
 [@dmitry]: https://github.com/dmitry
 [@drn]: https://github.com/drn
+[@f1sherman]: https://github.com/f1sherman
+[@faucct]: https://github.com/faucct
 [@Fivell]: https://github.com/Fivell
 [@gonzedge]: https://github.com/gonzedge
+[@innparusu95]: https://github.com/innparusu95
 [@javierjulio]: https://github.com/javierjulio
+[@jawa]: https://github.com/jawa
 [@johnnyshields]: https://github.com/johnnyshields
+[@markstory]: https://github.com/markstory
+[@Nguyenanh]: https://github.com/Nguyenanh
 [@PChambino]: https://github.com/PChambino
 [@potatosalad]: https://github.com/potatosalad
 [@pranas]: https://github.com/pranas
+[@renotocn]: https://github.com/renotocn
+[@RobinvanderVliet]: https://github.com/RobinvanderVliet
 [@seanlinsley]: https://github.com/seanlinsley
 [@shekibobo]: https://github.com/shekibobo
 [@timoschilling]: https://github.com/timoschilling
 [@TimPetricola]: https://github.com/TimPetricola
 [@varyonic]: https://github.com/varyonic
 [@zorab47]: https://github.com/zorab47
-[@alex-bogomolov]: https://github.com/alex-bogomolov

data/activeadmin.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'formtastic', '~> 3.1'
   s.add_dependency 'formtastic_i18n'
   s.add_dependency 'inherited_resources', '~> 1.7'
-  s.add_dependency 'jquery-rails'
+  s.add_dependency 'jquery-rails', '>= 4.2.0'
   s.add_dependency 'kaminari', '>= 0.15', '< 2.0'
   s.add_dependency 'railties', '>= 4.2', '< 5.2'
   s.add_dependency 'ransack', '~> 1.3'

data/config/locales/en.yml

@@ -21,6 +21,7 @@ en:
     has_many_new: "Add New %{model}"
     has_many_delete: "Delete"
     has_many_remove: "Remove"
+    move: "Move"
     filters:
       buttons:
         filter: "Filter"

data/config/locales/eo.yml

@@ -0,0 +1,144 @@
+eo:
+  active_admin:
+    dashboard: Panelo
+    dashboard_welcome:
+      welcome: "Bonvenon al Active Admin. Jen la defaŭlta panela paĝo."
+      call_to_action: "Por aldoni sekciojn al via panelo, vidu 'app/admin/dashboard.rb'"
+    view: "Vidi"
+    edit: "Redakti"
+    delete: "Forigi"
+    delete_confirmation: "Ĉu vi certas, ke vi volas forigi tion?"
+    create_another: "Krei alian %{model}"
+    new_model: "Nova %{model}"
+    edit_model: "Redakti %{model}"
+    delete_model: "Forigi %{model}"
+    details: "Detaloj de %{model}"
+    cancel: "Nuligi"
+    empty: "Malplena"
+    previous: "Antaŭa"
+    next: "Sekva"
+    download: "Elŝuti:"
+    has_many_new: "Aldoni novan %{model}"
+    has_many_delete: "Forigi"
+    has_many_remove: "Forigi"
+    move: "Movi"
+    filters:
+      buttons:
+        filter: "Filtri"
+        clear: "Viŝi filtrilojn"
+      predicates:
+        contains: "Enhavas"
+        equals: "Egalas al"
+        starts_with: "Komenciĝas per"
+        ends_with: "Finiĝas per"
+        greater_than: "Pli grandas ol"
+        less_than: "Malpli grandas ol"
+        gteq_datetime: "Pli grandas ol aŭ egalas al"
+        lteq_datetime: "Malpli grandas ol aŭ egalas al"
+        from: "De"
+        to: "Al"
+    search_status:
+      headline: "Serĉstato:"
+      current_scope: "Regiono:"
+      current_filters: "Nunaj filtriloj:"
+      no_current_filters: "Neniu"
+    status_tag:
+      "yes": "Jes"
+      "no": "Ne"
+    main_content: "Aldonu %{model}#main_content por montri la enhavon."
+    logout: "Elsaluti"
+    powered_by: "Povigita de %{active_admin} %{version}"
+    sidebars:
+      filters: "Filtriloj"
+      search_status: "Serĉstato"
+    pagination:
+      empty: "Neniu %{model} trovita"
+      one: "Montras <b>1</b> %{model}"
+      one_page: "Montras <b>ĉiujn %{n}</b> %{model}"
+      multiple: "Montras %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> de <b>%{total}</b> entute"
+      multiple_without_total: "Montras %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b>"
+      per_page: "Paĝe: "
+      entry:
+        one: "ero"
+        other: "eroj"
+    any: "Ĉiuj"
+    blank_slate:
+      content: "Ankoraŭ ne estas %{resource_name}."
+      link: "Krei novan"
+    dropdown_actions:
+      button_label: "Agoj"
+    batch_actions:
+      button_label: "Amasagoj"
+      default_confirmation: "Ĉu vi certas, ke vi volas fari tion?"
+      delete_confirmation: "Ĉu vi certas, ke vi volas forigi tiujn %{plural_model}?"
+      succesfully_destroyed:
+        one: "1 %{model} sukcese forigita"
+        other: "%{count} %{plural_model} sukcese forigitaj"
+      selection_toggle_explanation: "(Baskuligi elekton)"
+      action_label: "%{title} elektita"
+      labels:
+        destroy: "Forigi"
+    comments:
+      created_at: "Kreita"
+      resource_type: "Resursotipo"
+      author_type: "Aŭtorotipo"
+      body: "Enhavo"
+      author: "Aŭtoro"
+      add: "Aldoni komenton"
+      delete: "Forigi komenton"
+      delete_confirmation: "Ĉu vi certas, ke vi volas forigi tiun komenton?"
+      resource: "Resurso"
+      no_comments_yet: "Ankoraŭ neniu komento."
+      author_missing: "Anonimulo"
+      title_content: "Komentoj (%{count})"
+      errors:
+        empty_text: "La komento ne estis konservita, la teksto estis malplena."
+    devise:
+      username:
+        title: "Uzantnomo"
+      email:
+        title: "Retpoŝtadreso"
+      subdomain:
+        title: "Subdomajno"
+      password:
+        title: "Pasvorto"
+      password_confirmation:
+        title: "Konfirmi pasvorton"
+      sign_up:
+        title: "Registriĝi"
+        submit: "Registriĝi"
+      login:
+        title: "Ensaluti"
+        remember_me: "Memori min"
+        submit: "Ensaluti"
+      reset_password:
+        title: "Ĉu vi forgesis vian pasvorton?"
+        submit: "Restarigi mian pasvorton"
+      change_password:
+        title: "Ŝanĝi vian pasvorton"
+        submit: "Ŝanĝi mian pasvorton"
+      unlock:
+        title: "Resendi klarigojn por malŝlosi"
+        submit: "Resendi klarigojn por malŝlosi"
+      resend_confirmation_instructions:
+        title: "Resendi klarigojn por konfirmi"
+        submit: "Resendi klarigojn por konfirmi"
+      links:
+        sign_up: "Registriĝi"
+        sign_in: "Ensaluti"
+        forgot_your_password: "Ĉu vi forgesis vian pasvorton?"
+        sign_in_with_omniauth_provider: "Ensaluti per %{provider}"
+        resend_unlock_instructions: "Resendi klarigojn por malŝlosi"
+        resend_confirmation_instructions: "Resendi klarigojn por konfirmi"
+    unsupported_browser:
+      headline: "Rimarku ke ActiveAdmin ne plu subtenas versiojn 8 kaj mal
+      de Internet Explorer."
+      recommendation: "Ni rekomendas, ke vi <a href=\"http://browsehappy.com/\">ĝisdatigu vian retumilon</a> por plibonigi vian sperton."
+      turn_off_compatibility_view: "Se vi uzas version 8 aŭ pli novan de Internet Explorer, estu certa, ke vi <a href=\"https://support.microsoft.com/en-us/help/17471\">malŝaltu \"kongruecan reĝimon\"</a>."
+    access_denied:
+      message: "Vi ne rajtas fari tiun agon."
+    index_list:
+      table: "Tabelo"
+      block: "Listo"
+      grid: "Krado"
+      blog: "Blogo"

data/config/locales/it.yml

@@ -20,6 +20,7 @@ it:
     has_many_new: "Aggiungi nuovo/a %{model}"
     has_many_delete: "Rimuovi"
     has_many_remove: "Rimuovi"
+    move: "Sposta"
     filters:
       buttons:
         filter: "Filtra"
@@ -31,6 +32,10 @@ it:
         ends_with: "Finisce con"
         greater_than: "Maggiore di"
         less_than: "Minore di"
+        gteq_datetime: "Maggiore o uguale a"
+        lteq_datetime: "Minore o uguale a"
+        from: "Da"
+        to: "A"
     search_status:
       headline: "Situazione filtri:"
       current_scope: "Contesto selezionato:"
@@ -62,12 +67,12 @@ it:
       button_label: "Azioni"
     batch_actions:
       button_label: "Azioni multiple"
-      default_confirmation: "Sei sicuro di che voler fare questo?"
+      default_confirmation: "Sei sicuro di che voler proseguire?"
       delete_confirmation: "Sei sicuro di volere cancellare %{plural_model}?"
       succesfully_destroyed:
         one: "Eliminato con successo 1 %{model}"
         other: "Eliminati con successo %{count} %{plural_model}"
-      selection_toggle_explanation: "(Toggle Selection)"
+      selection_toggle_explanation: "(cambia selezione)"
       action_label: "%{title} Selezionati"
       labels:
         destroy: "Elimina"
@@ -122,7 +127,7 @@ it:
         resend_unlock_instructions: "Invia di nuovo le istruzioni per lo sblocco"
         resend_confirmation_instructions: "Invia di nuovo le istruzioni per la conferma"
     unsupported_browser:
-      headline: "Perfavore, notare che ActiveAdmin non supporta più Internet Explorer 8 o inferiore"
+      headline: "Avviso: ActiveAdmin non supporta Internet Explorer 8 o inferiore"
       recommendation: "Ti raccomandiamo di aggiornare alla versione più recente di <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>."
       turn_off_compatibility_view: "Se stai utilizzando Internet Explorer 9 o successivo, assicurati di <a href=\"https://support.microsoft.com/it-it/help/17471\">disabilitare la \"Modalità Compatibilità\"</a>."
     access_denied:

data/config/locales/ja.yml

@@ -8,6 +8,7 @@ ja:
     edit: "編集"
     delete: "削除"
     delete_confirmation: "本当に削除しますか？"
+    create_another: "%{model} を追加する"
     new_model: "%{model} を作成する"
     edit_model: "%{model} を編集する"
     delete_model: "%{model} を削除する"
@@ -31,6 +32,10 @@ ja:
         ends_with: "で終わる"
         greater_than: "より大きい"
         less_than: "より小さい"
+        gteq_datetime: "以上"
+        lteq_datetime: "以下"
+        from: "開始"
+        to: "終了"
     search_status:
       headline: "検索条件:"
       current_scope: "範囲:"

data/config/locales/pt-BR.yml

@@ -8,6 +8,7 @@ pt-BR:
     edit: "Editar"
     delete: "Remover"
     delete_confirmation: "Você tem certeza que deseja remover este item?"
+    create_another: "Criar outro %{model}"
     new_model: "Novo(a) %{model}"
     edit_model: "Editar %{model}"
     delete_model: "Remover %{model}"
@@ -31,6 +32,10 @@ pt-BR:
         ends_with: "Termina com"
         greater_than: "Maior Que"
         less_than: "Menor Que"
+        gteq_datetime: "Maior ou igual a"
+        lteq_datetime: "Menor ou igual a"
+        from: "A partir de"
+        to: "Até"
     search_status:
       headline: "Buscou:"
       current_scope: "Em:"
@@ -51,6 +56,7 @@ pt-BR:
       one_page: "Exibindo <b>todos(as) os(as) %{n}</b> %{model}"
       multiple: "Exibindo %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> de um total de <b>%{total}</b>"
       multiple_without_total: "Exibindo %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b>"
+      per_page: "Por página: "
       entry:
         one: "registro"
         other: "registros"
@@ -95,6 +101,8 @@ pt-BR:
         title: "Subdomínio"
       password:
         title: "Senha"
+      password_confirmation:
+        title: "Confirmação de senha"
       sign_up:
         title: "Cadastre-se"
         submit: "Continuar"

data/config/locales/sv-SE.yml

@@ -31,6 +31,8 @@
         ends_with: "Slutar med"
         greater_than: "Större än"
         less_than: "Mindre än"
+        from: "Från"
+        to: "Till"
     search_status:
       headline: "Sök status:"
       current_scope: "Scope:"

data/config/locales/vi.yml

@@ -1,9 +1,9 @@
 vi:
   active_admin:
-    dashboard: Dashboard
+    dashboard: Bảng điều khiển
     dashboard_welcome:
-      welcome: "Chào mừng bạn đến với Active Admin. Đây là trang Dashboard mặc định."
-      call_to_action: "Để thêm phần phần cho trang Dashboar hãy chỉnh sửa 'app/admin/dashboard.rb'"
+      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'"
     view: "Xem"
     edit: "Chỉnh sửa"
     delete: "Xóa"
@@ -25,12 +25,21 @@ vi:
         filter: "Lọc"
         clear: "Xóa dữ liệu lọc"
       predicates:
-        contains: "Thông tin"
+        contains: "Có chứa"
         equals: "Bằng"
         starts_with: "Bắt đầu với"
         ends_with: "Kết thúc với việc"
         greater_than: "Lớn hơn"
         less_than: "Nhỏ hơn"
+        gteq_datetime: "Lớn hơn hoặc bằng"
+        lteq_datetime: "Nhỏ hơn hoặc bằng"
+        from: "Từ"
+        to: "Đến"
+    search_status:
+      headline: "Danh sách tìm kiếm:"
+      current_scope: "Phạm vi:"
+      current_filters: "Bộ lộc hiện tại:"
+      no_current_filters: "Không có"
     status_tag:
       "yes": "Có"
       "no": "Không Có"
@@ -39,12 +48,14 @@ vi:
     powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "Bộ Lọc"
+      search_status: "Trạng thái tìm kiếm"
     pagination:
       empty: "Không có %{model} nào được tìm thấy"
       one: "Đang hiển thị <b>1</b> %{model}"
       one_page: "Đang hiển thị <b>tất cả %{n}</b> %{model}"
       multiple: "Đang hiển thị %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> of <b>%{total}</b> trong tất cả."
       multiple_without_total: "Đang hiển thị %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b>."
+      per_page: "Mỗi trang: "
       entry:
         one: "entry"
         other: "entries"
@@ -66,15 +77,33 @@ vi:
       labels:
         destroy: "Xóa"
     comments:
+      created_at: "Đã tạo"
+      resource_type: "Resource Type"
       body: "Nội dung"
       author: "Tác giả"
       add: "Thêm bình luận"
-      resource: "Tài nguyên"
+      delete: "Xoá bình luận"
+      delete_confirmation: "Bạn có chắc chắn muốn xóa những bình luận này?"
+      resource: "Resource"
       no_comments_yet: "Chưa có bình luận."
+      author_missing: "Vô danh"
       title_content: "Bình luận (%{count})"
       errors:
         empty_text: "Lời bình luận chưa được lưu, vì nội dung còn trống."
     devise:
+      username:
+        title: "Tên người dùng"
+      email:
+        title: "Email"
+      subdomain:
+        title: "Tên miền phụ"
+      password:
+        title: "Mật khẩu"
+      password_confirmation:
+        title: "Mật khẩu xác nhận"
+      sign_up:
+        title: "Đăng ký"
+        submit: "Đăng ký"
       login:
         title: "Đăng nhập"
         remember_me: "Ghi nhớ tôi"
@@ -85,8 +114,20 @@ vi:
       change_password:
         title: "Thay đổi mật khẩu của bạn"
         submit: "Thay đổi mật khẩu của tôi"
+      unlock:
+        title: "Gởi lại hướng dẫn mở khoá"
+        submit: "Gởi lại hướng dẫn mở khoá"
+      resend_confirmation_instructions:
+        title: "Gởi lại hướng dẫn xác nhận"
+        submit: "Gởi lại hướng dẫn xác nhận"
       links:
         sign_in: "Đăng nhập"
         forgot_your_password: "Quên mật khẩu của bạn?"
         sign_in_with_omniauth_provider: "Đăng nhập với %{provider}"
-
+    access_denied:
+      message: "Bạn không có quyền thực hiện tính năng này"
+    index_list:
+      table: "Bảng"
+      block: "Danh sách"
+      grid: "Lưới"
+      blog: "Blog"