From 738ee5cf356b821307b2cfef79ad11281c4441d3 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Fri, 8 Apr 2022 15:21:22 -0400
Subject: [PATCH] Suggested fixes for delay string, widen priority dropdown,
 add German and Turkish

---
 docs/releases.md                    | 2 ++
 web/public/static/langs/en.json     | 2 +-
 web/src/components/Preferences.js   | 2 ++
 web/src/components/PublishDialog.js | 8 ++++++--
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/releases.md b/docs/releases.md
index b9a0d8bf..79b7706d 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -18,6 +18,8 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
 **Translations (web app):**
 
 * Bulgarian (thanks to [@StoyanDimitrov](https://github.com/StoyanDimitrov))
+* German (thanks to [@cmeis](https://github.com/cmeis))
+* Turkish (thanks to [@ersen](https://ersen.moe/))
 
 -->
 
diff --git a/web/public/static/langs/en.json b/web/public/static/langs/en.json
index 07aaff56..76ce9620 100644
--- a/web/public/static/langs/en.json
+++ b/web/public/static/langs/en.json
@@ -70,7 +70,7 @@
   "publish_dialog_filename_label": "Filename",
   "publish_dialog_filename_placeholder": "Attachment filename",
   "publish_dialog_delay_label": "Delay",
-  "publish_dialog_delay_placeholder": "Delay delivery, e.g. 1649029748, 30m, or tomorrow, 9am",
+  "publish_dialog_delay_placeholder": "Delay delivery, e.g. {{unixTimestamp}}, {{relativeTime}}, or \"{{naturalLanguage}}\" (English only)",
   "publish_dialog_other_features": "Other features:",
   "publish_dialog_chip_click_label": "Click URL",
   "publish_dialog_chip_email_label": "Forward to email",
diff --git a/web/src/components/Preferences.js b/web/src/components/Preferences.js
index a8bd238d..d76a7b3e 100644
--- a/web/src/components/Preferences.js
+++ b/web/src/components/Preferences.js
@@ -390,7 +390,9 @@ const Language = () => {
             <FormControl fullWidth variant="standard" sx={{ m: 1 }}>
                 <Select value={i18n.language} onChange={(ev) => i18n.changeLanguage(ev.target.value)}>
                     <MenuItem value="en">English</MenuItem>
+                    <MenuItem value="de">Deutsch</MenuItem>
                     <MenuItem value="bg">Български</MenuItem>
+                    <MenuItem value="tr">Türkçe</MenuItem>
                 </Select>
             </FormControl>
         </Pref>
diff --git a/web/src/components/PublishDialog.js b/web/src/components/PublishDialog.js
index 291d6e4b..00ba3d14 100644
--- a/web/src/components/PublishDialog.js
+++ b/web/src/components/PublishDialog.js
@@ -310,7 +310,7 @@ const PublishDialog = (props) => {
                         <FormControl
                             variant="standard"
                             margin="dense"
-                            sx={{minWidth: 120, maxWidth: 200, flexGrow: 1}}
+                            sx={{minWidth: 170, maxWidth: 300, flexGrow: 1}}
                         >
                             <InputLabel/>
                             <Select
@@ -441,7 +441,11 @@ const PublishDialog = (props) => {
                             <TextField
                                 margin="dense"
                                 label={t("publish_dialog_delay_label")}
-                                placeholder={t("publish_dialog_delay_placeholder")}
+                                placeholder={t("publish_dialog_delay_placeholder", {
+                                    unixTimestamp: "1649029748",
+                                    relativeTime: "30m",
+                                    naturalLanguage: "tomorrow, 9am"
+                                })}
                                 value={delay}
                                 onChange={ev => setDelay(ev.target.value)}
                                 disabled={disabled}