From a49792b731f4d3a802421e5c582466ef9df12561 Mon Sep 17 00:00:00 2001
From: Timur Mukhamedishin <84380737+muhtimur@users.noreply.github.com>
Date: Tue, 4 Apr 2023 15:16:39 +0700
Subject: [PATCH] Fix date picker translation (#2883)

Signed-off-by: muhtimur <timur.mukhamedishin@xored.com>
---
 packages/ui/lang/en.json                             |  6 +++++-
 packages/ui/lang/ru.json                             |  6 +++++-
 packages/ui/src/components/calendar/DatePopup.svelte | 12 ++++++------
 packages/ui/src/plugin.ts                            |  6 +++++-
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/packages/ui/lang/en.json b/packages/ui/lang/en.json
index 37ad473eeb..b682e07d67 100644
--- a/packages/ui/lang/en.json
+++ b/packages/ui/lang/en.json
@@ -41,6 +41,10 @@
     "HoursLabel": "Hours",
     "Back": "Back",
     "Next": "Next",
-    "DropdownDefaultLabel": "Select Item"
+    "DropdownDefaultLabel": "Select Item",
+    "DD": "DD",
+    "MM": "MM",
+    "YYYY": "YYYY",
+    "HH": "HH"
   }
 }
diff --git a/packages/ui/lang/ru.json b/packages/ui/lang/ru.json
index d395de2ec8..37abe32359 100644
--- a/packages/ui/lang/ru.json
+++ b/packages/ui/lang/ru.json
@@ -41,6 +41,10 @@
     "HoursLabel": "Часы",
     "Back": "Назад",
     "Next": "Вперед",
-    "DropdownDefaultLabel": "Выберите Элемент"
+    "DropdownDefaultLabel": "Выберите Элемент",
+    "DD": "ДД",
+    "MM": "ММ",
+    "YYYY": "ГГГГ",
+    "HH": "ЧЧ"
   }
 }
diff --git a/packages/ui/src/components/calendar/DatePopup.svelte b/packages/ui/src/components/calendar/DatePopup.svelte
index 67944a9ecc..34b65e1bf9 100644
--- a/packages/ui/src/components/calendar/DatePopup.svelte
+++ b/packages/ui/src/components/calendar/DatePopup.svelte
@@ -258,7 +258,7 @@
         >
           {#if edits[0].value > -1}
             {edits[0].value.toString().padStart(2, '0')}
-          {:else}ДД{/if}
+          {:else}<Label label={ui.string.DD} />{/if}
         </span>
         <span class="separator">.</span>
         <span
@@ -271,7 +271,7 @@
         >
           {#if edits[1].value > -1}
             {edits[1].value.toString().padStart(2, '0')}
-          {:else}ММ{/if}
+          {:else}<Label label={ui.string.MM} />{/if}
         </span>
         <span class="separator">.</span>
         <span
@@ -284,7 +284,7 @@
         >
           {#if edits[2].value > -1}
             {edits[2].value.toString().padStart(4, '0')}
-          {:else}ГГГГ{/if}
+          {:else}<Label label={ui.string.YYYY} />{/if}
         </span>
         {#if withTime}
           <div class="time-divider" />
@@ -298,7 +298,7 @@
           >
             {#if edits[3].value > -1}
               {edits[3].value.toString().padStart(2, '0')}
-            {:else}ЧЧ{/if}
+            {:else}<Label label={ui.string.HH} />{/if}
           </span>
           <span class="separator">:</span>
           <span
@@ -311,7 +311,7 @@
           >
             {#if edits[4].value > -1}
               {edits[4].value.toString().padStart(2, '0')}
-            {:else}ММ{/if}
+            {:else}<Label label={ui.string.MM} />{/if}
           </span>
         {/if}
       </div>
@@ -352,7 +352,7 @@
     </div>
   </div>
   <div class="footer">
-    <Button kind={'primary'} label={ui.string.SaveDueDate} size={'x-large'} width={'100%'} on:click={closeDP} />
+    <Button kind={'primary'} label={ui.string.Save} size={'x-large'} width={'100%'} on:click={closeDP} />
   </div>
 </div>
 
diff --git a/packages/ui/src/plugin.ts b/packages/ui/src/plugin.ts
index 5fafe36855..7e8c5adf9b 100644
--- a/packages/ui/src/plugin.ts
+++ b/packages/ui/src/plugin.ts
@@ -66,7 +66,11 @@ export const uis = plugin(uiId, {
     HoursLabel: '' as IntlString,
     Back: '' as IntlString,
     Next: '' as IntlString,
-    DropdownDefaultLabel: '' as IntlString
+    DropdownDefaultLabel: '' as IntlString,
+    DD: '' as IntlString,
+    MM: '' as IntlString,
+    YYYY: '' as IntlString,
+    HH: '' as IntlString
   },
   metadata: {
     DefaultApplication: '' as Metadata<AnyComponent>,