From 70b128160a44bdb0d928fcf2292fc4b6146d9b04 Mon Sep 17 00:00:00 2001
From: Nitwel <nitwel@arcor.de>
Date: Tue, 22 Sep 2020 10:23:18 +0200
Subject: [PATCH] tweaked label display and a few translations

---
 app/src/displays/labels/index.ts              | 22 +++++++++++--------
 .../_system/interface/interface.vue           |  7 +++++-
 app/src/interfaces/checkboxes/index.ts        |  6 +++++
 app/src/interfaces/color/index.ts             |  5 ++++-
 .../interfaces/dropdown-multiselect/index.ts  |  4 ++++
 app/src/interfaces/dropdown/index.ts          |  4 ++++
 app/src/interfaces/repeater/options.vue       |  4 ++++
 app/src/lang/en-US/displays.json              |  9 ++++----
 app/src/lang/en-US/interfaces.json            | 14 ++++++++----
 9 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/app/src/displays/labels/index.ts b/app/src/displays/labels/index.ts
index 5952d9f0c9..a2ed5afdb3 100644
--- a/app/src/displays/labels/index.ts
+++ b/app/src/displays/labels/index.ts
@@ -69,6 +69,18 @@ export default defineDisplay(({ i18n }) => ({
 				options: {
 					template: '{{text}}',
 					fields: [
+						{
+							field: 'text',
+							name: i18n.t('text'),
+							type: 'string',
+							meta: {
+								interface: 'text-input',
+								width: 'half',
+								options: {
+									placeholder: i18n.t('displays.labels.choices_text_placeholder'),
+								},
+							},
+						},
 						{
 							field: 'value',
 							name: i18n.t('value'),
@@ -77,19 +89,11 @@ export default defineDisplay(({ i18n }) => ({
 								interface: 'text-input',
 								options: {
 									font: 'monospace',
+									placeholder: i18n.t('displays.labels.choices_value_placeholder'),
 								},
 								width: 'half',
 							},
 						},
-						{
-							field: 'text',
-							name: i18n.t('text'),
-							type: 'string',
-							meta: {
-								interface: 'text-input',
-								width: 'half',
-							},
-						},
 						{
 							field: 'foreground',
 							name: i18n.t('foreground_color'),
diff --git a/app/src/interfaces/_system/interface/interface.vue b/app/src/interfaces/_system/interface/interface.vue
index 50f6677bdb..efd7d2ef2f 100644
--- a/app/src/interfaces/_system/interface/interface.vue
+++ b/app/src/interfaces/_system/interface/interface.vue
@@ -1,5 +1,10 @@
 <template>
-	<v-select :items="items" @input="$listeners.input" :value="value" />
+	<v-select
+		:items="items"
+		@input="$listeners.input"
+		:value="value"
+		:placeholder="$t('interfaces.interface.placeholder')"
+	/>
 </template>
 
 <script lang="ts">
diff --git a/app/src/interfaces/checkboxes/index.ts b/app/src/interfaces/checkboxes/index.ts
index 703cd459e8..97702a69a0 100644
--- a/app/src/interfaces/checkboxes/index.ts
+++ b/app/src/interfaces/checkboxes/index.ts
@@ -24,7 +24,11 @@ export default defineInterface(({ i18n }) => ({
 							type: 'string',
 							name: i18n.t('text'),
 							meta: {
+								width: 'half',
 								interface: 'text-input',
+								options: {
+									placeholder: i18n.t('interfaces.dropdown.choices_name_placeholder'),
+								},
 							},
 						},
 						{
@@ -32,9 +36,11 @@ export default defineInterface(({ i18n }) => ({
 							type: 'string',
 							name: i18n.t('value'),
 							meta: {
+								width: 'half',
 								interface: 'text-input',
 								options: {
 									font: 'monospace',
+									placeholder: i18n.t('interfaces.dropdown.choices_name_placeholder'),
 								},
 							},
 						},
diff --git a/app/src/interfaces/color/index.ts b/app/src/interfaces/color/index.ts
index 5f7933cfe5..6f506ac51a 100644
--- a/app/src/interfaces/color/index.ts
+++ b/app/src/interfaces/color/index.ts
@@ -18,7 +18,7 @@ export default defineInterface(({ i18n }) => ({
 				width: 'full',
 				interface: 'repeater',
 				options: {
-					placeholder: i18n.t('interfaces.color.preset_colors_placeholder'),
+					addLabel: i18n.t('interfaces.color.preset_colors_add_label'),
 					template: '{{ name }} - {{ color }}',
 					fields: [
 						{
@@ -28,6 +28,9 @@ export default defineInterface(({ i18n }) => ({
 							meta: {
 								interface: 'text-input',
 								width: 'half',
+								options: {
+									placeholder: i18n.t('interfaces.color.name_placeholder'),
+								},
 							},
 						},
 						{
diff --git a/app/src/interfaces/dropdown-multiselect/index.ts b/app/src/interfaces/dropdown-multiselect/index.ts
index 07110791a0..794dc14c91 100644
--- a/app/src/interfaces/dropdown-multiselect/index.ts
+++ b/app/src/interfaces/dropdown-multiselect/index.ts
@@ -27,6 +27,9 @@ export default defineInterface(({ i18n }) => ({
 							meta: {
 								width: 'half',
 								interface: 'text-input',
+								options: {
+									placeholder: i18n.t('interfaces.dropdown.choices_name_placeholder'),
+								},
 							},
 						},
 						{
@@ -38,6 +41,7 @@ export default defineInterface(({ i18n }) => ({
 								interface: 'text-input',
 								options: {
 									font: 'monospace',
+									placeholder: i18n.t('interfaces.dropdown.choices_value_placeholder'),
 								},
 							},
 						},
diff --git a/app/src/interfaces/dropdown/index.ts b/app/src/interfaces/dropdown/index.ts
index a90bdd14f8..27ebd7e738 100644
--- a/app/src/interfaces/dropdown/index.ts
+++ b/app/src/interfaces/dropdown/index.ts
@@ -27,6 +27,9 @@ export default defineInterface(({ i18n }) => ({
 							meta: {
 								interface: 'text-input',
 								width: 'half',
+								options: {
+									placeholder: i18n.t('interfaces.dropdown.choices_name_placeholder'),
+								},
 							},
 						},
 						{
@@ -37,6 +40,7 @@ export default defineInterface(({ i18n }) => ({
 								interface: 'text-input',
 								options: {
 									font: 'monospace',
+									placeholder: i18n.t('interfaces.dropdown.choices_value_placeholder'),
 								},
 								width: 'half',
 							},
diff --git a/app/src/interfaces/repeater/options.vue b/app/src/interfaces/repeater/options.vue
index be6b71e050..9c5ffa1c2a 100644
--- a/app/src/interfaces/repeater/options.vue
+++ b/app/src/interfaces/repeater/options.vue
@@ -60,6 +60,7 @@ export default defineComponent({
 					sort: 1,
 					options: {
 						font: 'monospace',
+						placeholder: i18n.t('interfaces.repeater.field_name_placeholder'),
 					},
 				},
 				schema: null,
@@ -106,6 +107,9 @@ export default defineComponent({
 					interface: 'text-input',
 					width: 'half',
 					sort: 4,
+					options: {
+						placeholder: i18n.t('interfaces.repeater.field_note_placeholder'),
+					},
 				},
 				schema: null,
 			},
diff --git a/app/src/lang/en-US/displays.json b/app/src/lang/en-US/displays.json
index 5fc18d8c92..993d77656b 100644
--- a/app/src/lang/en-US/displays.json
+++ b/app/src/lang/en-US/displays.json
@@ -61,7 +61,10 @@
 			"description": "Display either a single or a list of labels",
 			"default_foreground": "Default Foreground",
 			"default_background": "Default Background",
-			"format_label": "Format each label"
+			"format_label": "Format each label",
+			"show_as_dot": "Show As Dot",
+			"choices_value_placeholder": "Enter a value...",
+			"choices_text_placeholder": "Enter a text..."
 
 		},
 		"mime-type": {
@@ -90,10 +93,6 @@
 			"name": "Name",
 			"both": "Both",
 			"circle_label": "Show user in a circle"
-		},
-		"labels": {
-			"labels": "Labels",
-			"show_as_dot": "Show as dot"
 		}
 	}
 }
diff --git a/app/src/lang/en-US/interfaces.json b/app/src/lang/en-US/interfaces.json
index a4a921423a..5db43a7f0d 100644
--- a/app/src/lang/en-US/interfaces.json
+++ b/app/src/lang/en-US/interfaces.json
@@ -29,7 +29,8 @@
 			"description": "Enter or select a color value",
 			"placeholder": "Choose a color...",
 			"preset_colors": "Preset Colors",
-			"preset_colors_placeholder": "Add a new color..."
+			"preset_colors_add_label": "Add new color...",
+			"name_placeholder": "Enter color name..."
 		},
 		"datetime": {
 			"datetime": "Datetime",
@@ -58,7 +59,9 @@
 			"allow_other": "Allow Other",
 			"allow_other_label": "Allow Other Values",
 			"allow_none": "Allow None",
-			"allow_none_label": "Allow No Selection"
+			"allow_none_label": "Allow No Selection",
+			"choices_name_placeholder": "Enter a name...",
+			"choices_value_placeholder": "Enter a value..."
 		},
 		"dropdown-multiselect": {
 			"dropdown-multiselect": "Dropdown (Multiple)",
@@ -89,7 +92,8 @@
 		},
 		"interface": {
 			"interface": "Interface",
-			"description": "Select an existing interface"
+			"description": "Select an existing interface",
+			"placeholder": "Select an interface..."
 		},
 		"interface-options": {
 			"interface-options": "Interface Options",
@@ -139,7 +143,9 @@
 			"max_amount": "Maximum Amount",
 			"max_amount_placeholder": "Maximum amount of items...",
 			"edit_fields": "Edit Fields",
-			"add_label": "\"Add New Row\" Label"
+			"add_label": "\"Add New Row\" Label",
+			"field_name_placeholder": "Enter field name...",
+			"field_note_placeholder": "Enter field note..."
 		},
 		"slider": {
 			"slider": "Slider",