From 915ff76ffc6a469aecf01df87f9a7410aca317e8 Mon Sep 17 00:00:00 2001
From: Azri Kahar <42867097+azrikahar@users.noreply.github.com>
Date: Mon, 27 Sep 2021 22:10:39 +0800
Subject: [PATCH] Fix multiple issues in Data Model view (#8333)
* disable the labels for disabled display templates
* fix color placeholder & field name
* fix singleton field label translation
* fix collections note placeholder translation
---
api/src/database/system-data/fields/collections.yaml | 6 +++---
app/src/components/v-field-template/v-field-template.vue | 4 ++--
app/src/lang/translations/ar-SA.yaml | 1 +
app/src/lang/translations/bg-BG.yaml | 3 ++-
app/src/lang/translations/ca-ES.yaml | 3 ++-
app/src/lang/translations/cs-CZ.yaml | 1 +
app/src/lang/translations/da-DK.yaml | 1 +
app/src/lang/translations/de-DE.yaml | 1 +
app/src/lang/translations/en-US.yaml | 1 +
app/src/lang/translations/es-419.yaml | 1 +
app/src/lang/translations/es-CL.yaml | 1 +
app/src/lang/translations/es-ES.yaml | 1 +
app/src/lang/translations/et-EE.yaml | 3 ++-
app/src/lang/translations/fi-FI.yaml | 1 +
app/src/lang/translations/fr-FR.yaml | 1 +
app/src/lang/translations/hu-HU.yaml | 1 +
app/src/lang/translations/id-ID.yaml | 1 +
app/src/lang/translations/it-IT.yaml | 1 +
app/src/lang/translations/ja-JP.yaml | 1 +
app/src/lang/translations/lt-LT.yaml | 1 +
app/src/lang/translations/ms-MY.yaml | 1 +
app/src/lang/translations/nl-NL.yaml | 1 +
app/src/lang/translations/pl-PL.yaml | 1 +
app/src/lang/translations/pt-BR.yaml | 3 ++-
app/src/lang/translations/pt-PT.yaml | 1 +
app/src/lang/translations/ru-RU.yaml | 1 +
app/src/lang/translations/sl-SI.yaml | 1 +
app/src/lang/translations/sr-CS.yaml | 1 +
app/src/lang/translations/sv-SE.yaml | 1 +
app/src/lang/translations/th-TH.yaml | 1 +
app/src/lang/translations/tr-TR.yaml | 1 +
app/src/lang/translations/uk-UA.yaml | 1 +
app/src/lang/translations/vi-VN.yaml | 1 +
app/src/lang/translations/zh-CN.yaml | 1 +
app/src/lang/translations/zh-TW.yaml | 1 +
35 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/api/src/database/system-data/fields/collections.yaml b/api/src/database/system-data/fields/collections.yaml
index efdd176dc0..8176c513c9 100644
--- a/api/src/database/system-data/fields/collections.yaml
+++ b/api/src/database/system-data/fields/collections.yaml
@@ -21,7 +21,7 @@ fields:
- field: note
interface: input
options:
- placeholder: A description of this collection...
+ placeholder: $t:field_options.directus_collections.note_placeholder
width: half
- field: icon
@@ -32,7 +32,7 @@ fields:
- field: color
interface: select-color
options:
- placeholder: $t:field_options.directus_collections.note_placeholder
+ placeholder: $t:interfaces.select-color.placeholder
width: half
- field: display_template
@@ -52,7 +52,7 @@ fields:
special: boolean
interface: boolean
options:
- label: Treat as single object
+ label: $t:singleton_label
width: half
- field: translations
diff --git a/app/src/components/v-field-template/v-field-template.vue b/app/src/components/v-field-template/v-field-template.vue
index ecc1fcf5c0..e52242b322 100644
--- a/app/src/components/v-field-template/v-field-template.vue
+++ b/app/src/components/v-field-template/v-field-template.vue
@@ -281,7 +281,7 @@ export default defineComponent({
if (!field) return '';
- return ``;
+ return ``;
})
.join('');
contentEl.value.innerHTML = newInnerHTML;
@@ -323,7 +323,7 @@ export default defineComponent({
user-select: none;
}
-:deep(button:hover) {
+:deep(button:not(:disabled):hover) {
color: var(--white);
background-color: var(--danger);
}
diff --git a/app/src/lang/translations/ar-SA.yaml b/app/src/lang/translations/ar-SA.yaml
index d2f25226b4..35e8872918 100644
--- a/app/src/lang/translations/ar-SA.yaml
+++ b/app/src/lang/translations/ar-SA.yaml
@@ -672,6 +672,7 @@ fields:
collection: المجموعة
icon: أيقونة
note: ملحوظة
+ color: لون
display_template: عرض القالب
hidden: مخفي
translations: ترجمات تسمية المجموعات
diff --git a/app/src/lang/translations/bg-BG.yaml b/app/src/lang/translations/bg-BG.yaml
index fbea856f1a..ce241b40ec 100644
--- a/app/src/lang/translations/bg-BG.yaml
+++ b/app/src/lang/translations/bg-BG.yaml
@@ -769,6 +769,7 @@ fields:
collection: Колекция
icon: Икона
note: Бележка
+ color: Цвят
display_template: Шаблон при показване
hidden: Скриване
singleton: Сек
@@ -894,7 +895,7 @@ field_options:
auth_password_policy:
none_text: Без - не се препоръчва
weak_text: Слаба - минимум от 8 символа
- strong_text: Силна - главни, малки, числа и специални символи
+ strong_text: Силна - главни, малки, числа и специални символи
storage_asset_presets:
fit:
contain_text: Напасване (запазване на съотношението)
diff --git a/app/src/lang/translations/ca-ES.yaml b/app/src/lang/translations/ca-ES.yaml
index 6d1df1074a..51fdbaaee2 100644
--- a/app/src/lang/translations/ca-ES.yaml
+++ b/app/src/lang/translations/ca-ES.yaml
@@ -598,7 +598,7 @@ wysiwyg_options:
superscript: Superíndex
codeblock: Codi
blockquote: Bloc de cita
- bullist: Llista amb vinyetes
+ bullist: Llista amb vinyetes
numlist: Llista ordenada
hr: Regle horitzontal
link: Afegeix / Edita l'enllaç
@@ -720,6 +720,7 @@ fields:
collection: Coŀlecció
icon: Icona
note: Nota
+ color: Color
display_template: Mostra la plantilla
hidden: Amagat
singleton: Singleton
diff --git a/app/src/lang/translations/cs-CZ.yaml b/app/src/lang/translations/cs-CZ.yaml
index 1c399f15db..bbb8021e61 100644
--- a/app/src/lang/translations/cs-CZ.yaml
+++ b/app/src/lang/translations/cs-CZ.yaml
@@ -314,6 +314,7 @@ fields:
collection: Kategorie
icon: Ikona
note: Poznámka
+ color: Barva
hidden: Skryté
directus_files:
title: Název
diff --git a/app/src/lang/translations/da-DK.yaml b/app/src/lang/translations/da-DK.yaml
index c6b1160c7f..f03fe94d1e 100644
--- a/app/src/lang/translations/da-DK.yaml
+++ b/app/src/lang/translations/da-DK.yaml
@@ -289,6 +289,7 @@ fields:
collection: Samling
icon: Ikon
note: Kommentar
+ color: Farve
hidden: Skjult
directus_files:
title: Titel
diff --git a/app/src/lang/translations/de-DE.yaml b/app/src/lang/translations/de-DE.yaml
index 2f28a3d6e7..bba3f3064c 100644
--- a/app/src/lang/translations/de-DE.yaml
+++ b/app/src/lang/translations/de-DE.yaml
@@ -834,6 +834,7 @@ fields:
collection: Sammlung
icon: Symbol
note: Notiz
+ color: Farbe
display_template: Anzeigevorlage
hidden: Ausgeblendet
singleton: Einzelnes Element
diff --git a/app/src/lang/translations/en-US.yaml b/app/src/lang/translations/en-US.yaml
index e89f9eaa0f..1d16c27c93 100644
--- a/app/src/lang/translations/en-US.yaml
+++ b/app/src/lang/translations/en-US.yaml
@@ -847,6 +847,7 @@ fields:
collection: Collection
icon: Icon
note: Note
+ color: Color
display_template: Display Template
hidden: Hidden
singleton: Singleton
diff --git a/app/src/lang/translations/es-419.yaml b/app/src/lang/translations/es-419.yaml
index b33c7e05ac..c11eb61258 100644
--- a/app/src/lang/translations/es-419.yaml
+++ b/app/src/lang/translations/es-419.yaml
@@ -703,6 +703,7 @@ fields:
collection: Colección
icon: Ícono
note: Nota
+ color: Color
display_template: Plantilla de Presentación
hidden: Oculto
singleton: Singleton
diff --git a/app/src/lang/translations/es-CL.yaml b/app/src/lang/translations/es-CL.yaml
index 61bad9fd6c..c826b856e3 100644
--- a/app/src/lang/translations/es-CL.yaml
+++ b/app/src/lang/translations/es-CL.yaml
@@ -703,6 +703,7 @@ fields:
collection: Colección
icon: Icono
note: Nota
+ color: Color
display_template: Plantilla de Presentación
hidden: Oculto
singleton: Singleton
diff --git a/app/src/lang/translations/es-ES.yaml b/app/src/lang/translations/es-ES.yaml
index e7a304cb7a..6ed073cb52 100644
--- a/app/src/lang/translations/es-ES.yaml
+++ b/app/src/lang/translations/es-ES.yaml
@@ -702,6 +702,7 @@ fields:
collection: Colección
icon: Ícono
note: Nota
+ color: Color
display_template: Plantilla de Presentación
hidden: Oculto
singleton: Singleton
diff --git a/app/src/lang/translations/et-EE.yaml b/app/src/lang/translations/et-EE.yaml
index 7b01919cf8..dfc3274fbe 100644
--- a/app/src/lang/translations/et-EE.yaml
+++ b/app/src/lang/translations/et-EE.yaml
@@ -640,7 +640,7 @@ page_help_docs_global: >-
page_help_files_collection: >-
**Failikogu* - Näitab kõiki faile ja pilte selles projektis. Muuta saab vaateid, filtreid jm ning lisada järjehoidjaid
page_help_files_item: >-
- **Faili detailid* - Vorm, milles saab muuta faili metaandmeid, ligipääse jm
+ **Faili detailid* - Vorm, milles saab muuta faili metaandmeid, ligipääse jm
page_help_settings_project: "**Projekti seaded** - Sinu projekti üldised seaded"
page_help_settings_datamodel_collections: >-
**Andmekogud** - Näitab kõiki andmekogusid (sh süsteemseid)
@@ -686,6 +686,7 @@ fields:
collection: Kogud
icon: Ikoon
note: Märkus
+ color: Värv
display_template: Vaate mall
hidden: Peidetud
singleton: Üksik
diff --git a/app/src/lang/translations/fi-FI.yaml b/app/src/lang/translations/fi-FI.yaml
index 6518700738..71d73dee4a 100644
--- a/app/src/lang/translations/fi-FI.yaml
+++ b/app/src/lang/translations/fi-FI.yaml
@@ -683,6 +683,7 @@ fields:
collection: Kokoelma
icon: Kuvake
note: Muistiinpano
+ color: Väri
display_template: Esitysmalli
hidden: Piilotettu
singleton: Singleton
diff --git a/app/src/lang/translations/fr-FR.yaml b/app/src/lang/translations/fr-FR.yaml
index 50223609ae..4660c5f630 100644
--- a/app/src/lang/translations/fr-FR.yaml
+++ b/app/src/lang/translations/fr-FR.yaml
@@ -764,6 +764,7 @@ fields:
collection: Collection
icon: Icône
note: Remarque
+ color: Couleur
display_template: Modèle d'affichage
hidden: Caché
singleton: Singleton
diff --git a/app/src/lang/translations/hu-HU.yaml b/app/src/lang/translations/hu-HU.yaml
index c024dbfc3a..1a4eb979a3 100644
--- a/app/src/lang/translations/hu-HU.yaml
+++ b/app/src/lang/translations/hu-HU.yaml
@@ -740,6 +740,7 @@ fields:
collection: Gyűjtemény
icon: Ikon
note: Jegyzet
+ color: Szín
display_template: Megjelenítési sablon
hidden: Rejtett
singleton: Egyedüli
diff --git a/app/src/lang/translations/id-ID.yaml b/app/src/lang/translations/id-ID.yaml
index c1df2ddae9..8c92c1a68a 100644
--- a/app/src/lang/translations/id-ID.yaml
+++ b/app/src/lang/translations/id-ID.yaml
@@ -489,6 +489,7 @@ fields:
collection: Koleksi
icon: Ikon
note: Catatan
+ color: Warna
display_template: Tampilan Template
hidden: Tersembunyi
sort_field: Sortir Baris
diff --git a/app/src/lang/translations/it-IT.yaml b/app/src/lang/translations/it-IT.yaml
index d8da2ed152..e2ee5cf1ff 100644
--- a/app/src/lang/translations/it-IT.yaml
+++ b/app/src/lang/translations/it-IT.yaml
@@ -834,6 +834,7 @@ fields:
collection: Raccolta
icon: Icona
note: Nota
+ color: Colore
display_template: Display Template
hidden: Nascosto
singleton: Singleton
diff --git a/app/src/lang/translations/ja-JP.yaml b/app/src/lang/translations/ja-JP.yaml
index c89b021fed..35c6929bc1 100644
--- a/app/src/lang/translations/ja-JP.yaml
+++ b/app/src/lang/translations/ja-JP.yaml
@@ -312,6 +312,7 @@ fields:
directus_collections:
icon: アイコン
note: 備考
+ color: 色
hidden: 非表示
singleton: シングルトン
sort_field: フィールドの並べ替え
diff --git a/app/src/lang/translations/lt-LT.yaml b/app/src/lang/translations/lt-LT.yaml
index 2017676609..65de94d197 100644
--- a/app/src/lang/translations/lt-LT.yaml
+++ b/app/src/lang/translations/lt-LT.yaml
@@ -639,6 +639,7 @@ fields:
collection: Rinkinys
icon: Ikona
note: Pastaba
+ color: Spalva
display_template: Rodymo šablonas
hidden: Paslėptas
singleton: Singleton objektas
diff --git a/app/src/lang/translations/ms-MY.yaml b/app/src/lang/translations/ms-MY.yaml
index 95b0b6d4bf..9cc87e024b 100644
--- a/app/src/lang/translations/ms-MY.yaml
+++ b/app/src/lang/translations/ms-MY.yaml
@@ -97,6 +97,7 @@ fields:
directus_collections:
collection: Koleksi
note: Nota
+ color: Warna
directus_files:
title: Tajuk
description: Penerangan
diff --git a/app/src/lang/translations/nl-NL.yaml b/app/src/lang/translations/nl-NL.yaml
index cf07f2e3b1..df987f65ce 100644
--- a/app/src/lang/translations/nl-NL.yaml
+++ b/app/src/lang/translations/nl-NL.yaml
@@ -703,6 +703,7 @@ fields:
collection: Collectie
icon: Icoon
note: Notitie
+ color: Kleur
display_template: Weergavesjabloon
hidden: Verborgen
singleton: Singleton
diff --git a/app/src/lang/translations/pl-PL.yaml b/app/src/lang/translations/pl-PL.yaml
index 5ae3e37132..b2b3054d00 100644
--- a/app/src/lang/translations/pl-PL.yaml
+++ b/app/src/lang/translations/pl-PL.yaml
@@ -708,6 +708,7 @@ fields:
collection: Kolekcja
icon: Ikona
note: Notatka
+ color: Kolor
display_template: Wyświetl szablon
hidden: Ukryte
singleton: Singleton
diff --git a/app/src/lang/translations/pt-BR.yaml b/app/src/lang/translations/pt-BR.yaml
index 84175c1f25..b6071e720c 100644
--- a/app/src/lang/translations/pt-BR.yaml
+++ b/app/src/lang/translations/pt-BR.yaml
@@ -721,6 +721,7 @@ fields:
collection: Coleção
icon: Ícone
note: Nota
+ color: Cor
display_template: Modelo de exibição
hidden: Oculto
singleton: Singleton
@@ -826,7 +827,7 @@ fields:
collection_list: Navegação da Coleção
directus_webhooks:
name: Nome
- method: Método
+ method: Método
status: Status
data: Dados
data_label: Enviar Dados do Evento
diff --git a/app/src/lang/translations/pt-PT.yaml b/app/src/lang/translations/pt-PT.yaml
index a7d0decf76..b0a2c39948 100644
--- a/app/src/lang/translations/pt-PT.yaml
+++ b/app/src/lang/translations/pt-PT.yaml
@@ -558,6 +558,7 @@ fields:
directus_collections:
collection: Coleção
note: Nota
+ color: Cor
display_template: Templates de Exibição
sort_field: Campo de ordenação
directus_files:
diff --git a/app/src/lang/translations/ru-RU.yaml b/app/src/lang/translations/ru-RU.yaml
index cd9004dfb0..f67c83e825 100644
--- a/app/src/lang/translations/ru-RU.yaml
+++ b/app/src/lang/translations/ru-RU.yaml
@@ -768,6 +768,7 @@ fields:
collection: Коллекция
icon: Иконка
note: Заметка
+ color: Цвет
display_template: Шаблон отображения
hidden: Скрыто
singleton: Синглтон
diff --git a/app/src/lang/translations/sl-SI.yaml b/app/src/lang/translations/sl-SI.yaml
index 70e391d702..3009071e15 100644
--- a/app/src/lang/translations/sl-SI.yaml
+++ b/app/src/lang/translations/sl-SI.yaml
@@ -722,6 +722,7 @@ fields:
collection: Zbirka
icon: Ikona
note: Opomba
+ color: Barva
display_template: Prikaži predlogo
hidden: Skrito
singleton: En zapis
diff --git a/app/src/lang/translations/sr-CS.yaml b/app/src/lang/translations/sr-CS.yaml
index fca10abbd0..dcf41625dc 100644
--- a/app/src/lang/translations/sr-CS.yaml
+++ b/app/src/lang/translations/sr-CS.yaml
@@ -685,6 +685,7 @@ fields:
collection: Kolekcija
icon: Ikonica
note: Napomena
+ color: Boja
display_template: Šablon za Prikaz
hidden: Sakriveno
singleton: Singleton
diff --git a/app/src/lang/translations/sv-SE.yaml b/app/src/lang/translations/sv-SE.yaml
index 7078dbfb78..3012fc3062 100644
--- a/app/src/lang/translations/sv-SE.yaml
+++ b/app/src/lang/translations/sv-SE.yaml
@@ -664,6 +664,7 @@ fields:
collection: Kollektion
icon: Ikon
note: Anteckning
+ color: Färg
display_template: Visningsmall
hidden: Dold
singleton: Singleton
diff --git a/app/src/lang/translations/th-TH.yaml b/app/src/lang/translations/th-TH.yaml
index a02ded216b..7293da299f 100644
--- a/app/src/lang/translations/th-TH.yaml
+++ b/app/src/lang/translations/th-TH.yaml
@@ -744,6 +744,7 @@ fields:
collection: คอลเลกชัน
icon: ไอคอน
note: หมายเหตุ
+ color: สี
display_template: แม่แบบการแสดงผล
hidden: ซ่อน
singleton: Singleton
diff --git a/app/src/lang/translations/tr-TR.yaml b/app/src/lang/translations/tr-TR.yaml
index bb29eaea83..1b377e8962 100644
--- a/app/src/lang/translations/tr-TR.yaml
+++ b/app/src/lang/translations/tr-TR.yaml
@@ -550,6 +550,7 @@ fields:
collection: Koleksiyon
icon: İkon
note: Not
+ color: Renk
display_template: Görüntüleme Şablonu
hidden: Gizli
sort_field: Sıralama Alanı
diff --git a/app/src/lang/translations/uk-UA.yaml b/app/src/lang/translations/uk-UA.yaml
index 8c63cf82b4..62251c7520 100644
--- a/app/src/lang/translations/uk-UA.yaml
+++ b/app/src/lang/translations/uk-UA.yaml
@@ -235,6 +235,7 @@ fields:
collection: Колекція
icon: Іконка
note: Примітка
+ color: Колір
hidden: Приховано
directus_files:
title: Заголовок
diff --git a/app/src/lang/translations/vi-VN.yaml b/app/src/lang/translations/vi-VN.yaml
index 270e886648..e1670930fc 100644
--- a/app/src/lang/translations/vi-VN.yaml
+++ b/app/src/lang/translations/vi-VN.yaml
@@ -490,6 +490,7 @@ fields:
collection: Danh mục
icon: Biểu tượng
note: Ghi chú
+ color: Màu sắc
display_template: Mẫu hiển thị
hidden: Ẩn
sort_field: Sắp xếp theo trường
diff --git a/app/src/lang/translations/zh-CN.yaml b/app/src/lang/translations/zh-CN.yaml
index 068b079f55..850f8b0e33 100644
--- a/app/src/lang/translations/zh-CN.yaml
+++ b/app/src/lang/translations/zh-CN.yaml
@@ -766,6 +766,7 @@ fields:
collection: 收藏
icon: 图标
note: 注释
+ color: 颜色
display_template: 显示模板
hidden: 隐藏
singleton: 单一
diff --git a/app/src/lang/translations/zh-TW.yaml b/app/src/lang/translations/zh-TW.yaml
index 19097ec9b6..cecd55c179 100644
--- a/app/src/lang/translations/zh-TW.yaml
+++ b/app/src/lang/translations/zh-TW.yaml
@@ -456,6 +456,7 @@ fields:
collection: 集合
icon: 圖示
note: 備註
+ color: 顏色
display_template: 顯示模板
hidden: 隱藏
sort_field: 排序欄位