8000 Merge pull request #5794 from javierjulio/add-status-tag-unknown · stephancom/activeadmin@97e48ec · GitHub
[go: up one dir, main page]
Skip to content

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 97e48ec

Browse files
javierjuliojavierjulio
authored
Merge pull request activeadmin#5794 from javierjulio/add-status-tag-unknown
Update `status_tag` to support separate `nil` and `false` boolean cases
2 parents 1ccb600 + 40f6bab commit 97e48ec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+71
-3
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions

‎config/locales/ar.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ ar:
3737
current_filters: "المُرشحات الحاليّة:"
3838
no_current_filters: "بدون"
3939
status_tag:
40-
'yes': "نعم"
41-
'no': "لا"
40+
"yes": "نعم"
41+
"no": "لا"
42+
"unset": "لا"
4243
main_content: "الرجاء تنفيذ %{model}#main_content لعرض المحتوى."
4344
logout: "تسجيل الخروج"
4445
powered_by: "تنفيذ %{active_admin} %{version}"

‎config/locales/bg.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ bg:
3434
status_tag:
3535
"yes": "Да"
3636
"no": "не"
37+
"unset": "не"
3738
main_content: "Добавете %{model}#main_content за да видите съдържание."
3839
logout: "Изход"
3940
powered_by: "Задвижва се от %{active_admin} %{version}"

‎config/locales/bs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ bs:
3434
status_tag:
3535
"yes": "Da"
3636
"no": "Nema"
37+
"unset": "Nema"
3738
main_content: "Molim Vas, implementirajte %{model}#main_content da biste prikazali sadržaj."
3839
logout: "Odjavi se"
3940
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/ca.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ ca:
3535
status_tag:
3636
"yes": "Sí"
3737
"no": "No"
38+
"unset": "No"
3839
main_content: "Implementa %{model}#main_content per mostrar contingut."
3940
logout: "Desconnecta't"
4041
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/cs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ cs:
3434
status_tag:
3535
"yes": "Ano"
3636
"no": "Ne"
37+
"unset": "Ne"
3738
main_content: "Implementujte prosím %{model}#main_content pro zobrazení obsahu."
3839
logout: "Odhlásit"
3940
powered_by: "%{active_admin} %{version}"

‎config/locales/da.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ da:
4040
status_tag:
4141
"yes": "Ja"
4242
"no": "Nej"
43+
"unset": "Nej"
4344
main_content: "Implementer venligst %{model}#main_content for at vise noget indhold."
4445
logout: "Log ud"
4546
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/de-CH.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
status_tag:
3535
"yes": "Ja"
3636
"no": "Nicht"
37+
"unset": "Nicht"
3738
main_content: "Bitte implementieren Sie %{model}#main_content, um Inhalte anzuzeigen."
3839
logout: "Abmelden"
3940
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/de.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ de:
4545
status_tag:
4646
"yes": "Ja"
4747
"no": "Nein"
48+
"unset": "Nein"
4849
main_content: "Bitte implementieren Sie %{model}#main_content, um Inhalte anzuzeigen."
4950
logout: "Abmelden"
5051
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/el.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ el:
3434
status_tag:
3535
"yes": "Ναι"
3636
"no": "Όχι"
37+
"unset": "Όχι"
3738
main_content: "Παρακαλώ υλοποιήστε την %{model}#main_content για να εμφανίσετε περιεχόμενο."
3839
logout: "Αποσύνδεση"
3940
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/en-CA.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
status_tag:
4141
"yes": "Yes"
4242
"no": "No"
43+
"unset": "No"
4344
main_content: "Please implement %{model}#main_content to display content."
4445
logout: "Logout"
4546
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/en-GB.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
status_tag:
4141
"yes": "Yes"
4242
"no": "No"
43+
"unset": "No"
4344
main_content: "Please implement %{model}#main_content to display content."
4445
logout: "Logout"
4546
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/en.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ en:
6363
status_tag:
6464
"yes": "Yes"
6565
"no": "No"
66+
"unset": "No"
6667
main_content: "Please implement %{model}#main_content to display content."
6768
logout: "Logout"
6869
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/eo.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ eo:
4545
status_tag:
4646
"yes": "Jes"
4747
"no": "Ne"
48+
"unset": "Ne"
4849
main_content: "Aldonu %{model}#main_content por montri la enhavon."
4950
logout: "Elsaluti"
5051
powered_by: "Povigita de %{active_admin} %{version}"

‎config/locales/es-MX.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ es-MX:
3434
status_tag:
3535
"yes": "Sí"
3636
"no": "No"
37+
"unset": "No"
3738
main_content: "Por favor implemente %{model}#main_content para mostrar contenido."
3839
logout: "Salir"
3940
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/es.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ es:
6363
status_tag:
6464
"yes": "Sí"
6565
"no": "No"
66+
"unset": "No"
6667
main_content: "Por favor implemente %{model}#main_content para mostrar contenido."
6768
logout: "Salir"
6869
powered_by: "Funciona con %{active_admin} %{version}"

‎config/locales/fa.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ fa:
3434
status_tag:
3535
"yes": "بله"
3636
"no": "بدون"
37+
"unset": "بدون"
3738
main_content: "لطفا %{model}#main_content را پیاده سازی کنید تا محتوی نمایش داده شود."
3839
logout: "خروج"
3940
powered_by: "قدرت گرفته از %{active_admin} %{version}"

‎config/locales/fi.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ fi:
3434
status_tag:
3535
"yes": "Kyllä"
3636
"no": "Ei"
37+
"unset": "Ei"
3738
main_content: "Ole hyvä, käytä %{model}#main_content:ia nähdäksesi jotain."
3839
logout: "Kirjaudu ulos"
3940
powered_by: "Käyttää %{active_admin} %{version}:ia"

‎config/locales/fr.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ fr:
4444
status_tag:
4545
"yes": "Oui"
4646
"no": "Non"
47+
"unset": "Non"
4748
main_content: "Veuillez implémenter %{model}#main_content pour afficher le contenu."
4849
logout: "Déconnexion"
4950
powered_by: "Propulsé par %{active_admin} %{version}"

‎config/locales/he.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ he:
4242
status_tag:
4343
"yes": "כן"
4444
"no": "לא"
45+
"unset": "לא"
4546
main_content: "אנא הטמע את %{model}#main_content בכדי להציג תוכן."
4647
logout: "התנתקות"
4748
powered_by: "ממונע בעזרת %{active_admin} %{version}"

‎config/locales/hr.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ hr:
3434
status_tag:
3535
"yes": "Da"
3636
"no": "Nema"
37+
"unset": "Nema"
3738
main_content: "Molim Vas, implementirajte %{model}#main_content da biste prikazali sadržaj."
3839
logout: "Odjavi se"
3940
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/hu.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ hu:
3838
status_tag:
3939
"yes": "Igen"
4040
"no": "Nem"
41+
"unset": "Nem"
4142
main_content: "Kérem, implementálja a %{model}#main_content metódust a tartalom megjelenítéséhez."
4243
logout: "Kilépés"
4344
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/id.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ id:
3939
status_tag:
4040
"yes": "Ya"
4141
"no": "Tidak"
42+
"unset": "Tidak"
4243
main_content: "Harap mengimplementasikan %{model}#main_content untuk menampilkan konten."
4344
logout: "Keluar"
4445
powered_by: "Dibuat dengan %{active_admin} %{version}"

‎config/locales/it.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ it:
4545
status_tag:
4646
"yes": "Sì"
4747
"no": "No"
48+
"unset": "No"
4849
main_content: "Devi implemetare %{model}#main_content per mostrarne il contenuto."
4950
logout: "Esci"
5051
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/ja.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ ja:
4444
status_tag:
4545
"yes": "はい"
4646
"no": "いいえ"
47+
"unset": "いいえ"
4748
main_content: "内容を表示するために %{model}#main_content を実装してください。"
4849
logout: "ログアウト"
4950
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/ko.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ ko:
3939
status_tag:
4040
"yes": "있음"
4141
"no": "없음"
42+
"unset": "없음"
4243
main_content: "내용을 보시려면 %{model}#main_content의 코드를 먼저 구현해 주시기 바랍니다."
4344
logout: "로그아웃"
4445
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/lt.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ lt:
4343
status_tag:
4444
"yes": "Taip"
4545
"no": "Nėra"
46+
"unset": "Nėra"
4647
main_content: 'Prašome realizuoti %{model}#main_content turiniui vaizduoti.'
4748
logout: 'Išeiti'
4849
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/lv.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ lv:
3434
status_tag:
3535
"yes": "Jā"
3636
"no": "Nē"
37+
"unset": "Nē"
3738
main_content: "Lūdzu implementēt %{model}#main_content, lai rādītos saturs."
3839
logout: "Iziet"
3940
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/mk.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ mk:
5252
status_tag:
5353
"yes": "Да"
5454
"no": "Не"
55+
"unset": "Не"
5556
main_content: "Ве замолуваме имплементирајте %{model}#main_content за да прикажете содржина."
5657
logout: "Одјави се"
5758
powered_by: "Овозможено од %{active_admin} %{version}"

‎config/locales/nb.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ nb:
4343
status_tag:
4444
"yes": "Ja"
4545
"no": "Nei"
46+
"unset": "Nei"
4647
main_content: "Vennligst implementer %{model}#main_content for å vise innhold."
4748
logout: "Logg ut"
4849
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/nl.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ nl:
4545
status_tag:
4646
"yes": "Ja"
4747
"no": "Geen"
48+
"unset": "Geen"
4849
main_content: "Implementeer %{model}#main_content om de content weer te geven."
4950
logout: "Uitloggen"
5051
powered_by: "Mogelijk gemaakt door %{active_admin} %{version}"

‎config/locales/pl.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ pl:
6767
status_tag:
6868
"yes": "Tak"
6969
"no": "Nie"
70+
"unset": "Nie"
7071
main_content: "Zaimplementuj %{model}#main_content aby wyświetlić treść."
7172
logout: "Wyloguj"
7273
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/pt-BR.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ pt-BR:
4444
status_tag:
4545
"yes": "Sim"
4646
"no": "Não"
47+
"unset": "Não"
4748
main_content: "Por favor implemente %{model}#main_content para exibir conteúdo."
4849
logout: "Sair"
4950
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/pt-PT.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
status_tag:
3535
"yes": "Sim"
3636
"no": "Não"
37+
"unset": "Não"
3738
main_content: "Por favor implemente %{model}#main_content para mostrar o conteúdo."
3839
logout: "Sair"
3940
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/ro.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ ro:
3434
status_tag:
3535
"yes": "Da"
3636
"no": "Nu"
37+
"unset": "Nu"
3738
main_content: "Va rugam sa implementati %{model}#main_content pentru a afisa continut."
3839
logout: "Iesire"
3940
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/ru.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ ru:
4141
status_tag:
4242
"yes": "Да"
4343
"no": "Нет"
44+
"unset": "Нет"
4445
main_content: "Создайте %{model}#main_content для отображения содержимого."
4546
logout: "Выйти"
4647
powered_by: "Работает на %{active_admin} %{version}"

‎config/locales/sk.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ sk:
3434
status_tag:
3535
"yes": "Áno"
3636
"no": "Nie"
37+
"unset": "Nie"
3738
main_content: "Implementujte prosím %{model}#main_content pre zobrazenie obsahu."
3839
logout: "Odhlásiť"
3940
powered_by: "%{active_admin} %{version}"

‎config/locales/sv-SE.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
status_tag:
4242
"yes": "Ja"
4343
"no": "Nej"
44+
"unset": "Nej"
4445
main_content: "Implementera %{model}#main_content för att kunna visa något."
4546
logout: "Logga ut"
4647
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/tr.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ tr:
4545
status_tag:
4646
"yes": "Evet"
4747
"no": "Hayır"
48+
"unset": "Hayır"
4849
main_content: "İçeriği görüntülemek için lütfen %{model}#main_content metodunu ekleyin."
4950
logout: "Çıkış Yap"
5051
powered_by: "%{active_admin} %{version} tarafından desteklenmektedir."

‎config/locales/uk.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ uk:
4141
status_tag:
4242
"yes": "Так"
4343
"no": "Ні"
44+
"unset": "Ні"
4445
main_content: "Створіть %{model}#main_content для відображення вмісту."
4546
logout: "Вийти"
4647
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/vi.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ vi:
4343
status_tag:
4444
"yes": "Có"
4545
"no": "Không Có"
46+
"unset": "Không Có"
4647
main_content: "Xin bổ sung %{model}#main_content để hiển thị nội dung."
4748
logout: "Đăng xuất"
4849
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/zh-CN.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
status_tag:
4545
"yes": "是"
4646
"no": "否"
47+
"unset": "否"
4748
main_content: "请执行 %{model}#main_content 来显示内容."
4849
logout: "退出"
4950
powered_by: "Powered by %{active_admin} %{version}"

‎config/locales/zh-TW.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
status_tag:
4040
"yes": "是"
4141
"no": "否"
42+
"unset": "否"
4243
main_content: "請實作 %{model}#main_content 以顯示內容。"
4344
logout: "登出"
4445
powered_by: "Powered by %{active_admin} %{version}"

‎docs/12-arbre-components.md

Lines changed: 13 additions & 0 deletions

‎lib/active_admin/views/components/status_tag.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,19 @@ def convert_to_boolean_status(status)
5151
case status
5252
when true, 'true'
5353
'Yes'
54-
when false, 'false', nil
54+
when false, 'false'
5555
'No'
56+
when nil
57+
'Unset'
5658
else
5759
status
5860
end
5961
end
6062

6163
def status_to_class(status)
6264
case status
65+
when 'Unset'
66+
'unset no'
6367
when String, Symbol
6468
status.to_s.titleize.gsub(/\s/, '').underscore
6569
else

0 commit comments

Comments
 (0)
0