From c034b320348af7343e64e20685e0b0520d1222ce Mon Sep 17 00:00:00 2001
From: Christian Hartmann <chris-hartmann@gmx.de>
Date: Thu, 8 Sep 2022 18:12:08 +0200
Subject: [PATCH] Fix overwriting placeholder property

Signed-off-by: Christian Hartmann <chris-hartmann@gmx.de>
---
 l10n/messages.pot                             | 18 ++++++++++++++++
 .../NcDatetimePicker/NcDatetimePicker.vue     | 21 ++++++++++++-------
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/l10n/messages.pot b/l10n/messages.pot
index 78883b0dad..8923f859ee 100644
--- a/l10n/messages.pot
+++ b/l10n/messages.pot
@@ -122,6 +122,24 @@ msgstr ""
 msgid "People & Body"
 msgstr ""
 
+msgid "Pick a date"
+msgstr ""
+
+msgid "Pick a date and a time"
+msgstr ""
+
+msgid "Pick a month"
+msgstr ""
+
+msgid "Pick a time"
+msgstr ""
+
+msgid "Pick a week"
+msgstr ""
+
+msgid "Pick a year"
+msgstr ""
+
 msgid "Pick an emoji"
 msgstr ""
 
diff --git a/src/components/NcDatetimePicker/NcDatetimePicker.vue b/src/components/NcDatetimePicker/NcDatetimePicker.vue
index a83c89fa08..72a9c2d708 100644
--- a/src/components/NcDatetimePicker/NcDatetimePicker.vue
+++ b/src/components/NcDatetimePicker/NcDatetimePicker.vue
@@ -130,7 +130,7 @@ export default {
 		:formatter="formatter"
 		:lang="lang"
 		:minute-step="minuteStep"
-		:placeholder="placeholder"
+		:placeholder="placeholder ? placeholder : defaultPlaceholder"
 		:popup-class="{ 'show-week-number': showWeekNumber }"
 		:show-week-number="showWeekNumber"
 		:type="type"
@@ -266,6 +266,11 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+
+		placeholder: {
+			type: String,
+			default: null,
+		},
 	},
 
 	emits: [
@@ -307,23 +312,23 @@ export default {
 		 *
 		 * @return {string}
 		 */
-		placeholder() {
+		defaultPlaceholder() {
 			if (this.type === 'time') {
-				return this.t('Pick a time')
+				return t('Pick a time')
 			}
 			if (this.type === 'month') {
-				return this.t('Pick a month')
+				return t('Pick a month')
 			}
 			if (this.type === 'year') {
-				return this.t('Pick a year')
+				return t('Pick a year')
 			}
 			if (this.type === 'week') {
-				return this.t('Pick a week')
+				return t('Pick a week')
 			}
 			if (this.type === 'date') {
-				return this.t('Pick a date')
+				return t('Pick a date')
 			}
-			return this.t('Pick a date and a time')
+			return t('Pick a date and a time')
 		},
 
 		/**