Merge branch 'dev' into shareous

nightscout · Oct 6, 2023 · 10cd789 · 10cd789
2 parents 203f16f + 5f8c734
commit 10cd789
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/lib/api3/generic/history/operation.js b/lib/api3/generic/history/operation.js
@@ -103,9 +103,7 @@ function parseFilter (opCtx) {
   }
 
   return [
-    { field: 'srvModified', operator: operator, value: lastModified.getTime() },
-    { field: 'created_at', operator: operator, value: lastModified.toISOString() },
-    { field: 'date', operator: operator, value: lastModified.getTime() }
+    { field: 'srvModified', operator: operator, value: lastModified.getTime() }
   ];
 }
 
@@ -116,9 +114,7 @@ function parseFilter (opCtx) {
  */
 function prepareSort () {
   return {
-    srvModified: 1,
-    created_at: 1,
-    date: 1
+    srvModified: 1
   };
 }
 

diff --git a/lib/language.js b/lib/language.js
@@ -39,6 +39,7 @@ function init (fs) {
     , { code: 'sl', file: 'sl_SL', language: 'Slovenščina', speechCode: 'sl-SL' }
     , { code: 'sv', file: 'sv_SE', language: 'Svenska', speechCode: 'sv-SE' }
     , { code: 'tr', file: 'tr_TR', language: 'Türkçe', speechCode: 'tr-TR' }
+    , { code: 'uk', file: 'uk_UA', language: 'українська', speechCode: 'uk-UA' }
     , { code: 'zh_cn', file: 'zh_CN', language: '中文（简体）', speechCode: 'cmn-Hans-CN' }
 //    , { code: 'zh_tw', file: 'zh_TW', language: '中文（繁體）', speechCode: 'cmn-Hant-TW' }
   ];