UBER-401 (#3381)

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>

models/contact/src/index.ts

@@ -801,6 +801,7 @@ export function createModel (builder: Builder): void {
     core.space.Model,
     {
       label: view.string.FilterIsEither,
+      selectedLabel: view.string.FilterIsEitherPlural,
       result: contact.function.FilterChannelInResult
     },
     contact.filter.FilterChannelIn

models/tags/src/index.ts

@@ -130,6 +130,7 @@ export function createModel (builder: Builder): void {
     core.space.Model,
     {
       label: view.string.FilterIsEither,
+      selectedLabel: view.string.FilterIsEitherPlural,
       result: tags.function.FilterTagsInResult
     },
     tags.filter.FilterTagsIn

models/view/src/index.ts

@@ -795,6 +795,7 @@ export function createModel (builder: Builder): void {
     core.space.Model,
     {
       label: view.string.FilterIsEither,
+      selectedLabel: view.string.FilterIsEitherPlural,
       result: view.function.FilterValueInResult
     },
     view.filter.FilterValueIn
@@ -815,6 +816,7 @@ export function createModel (builder: Builder): void {
     core.space.Model,
     {
       label: view.string.FilterIsEither,
+      selectedLabel: view.string.FilterIsEitherPlural,
       result: view.function.FilterObjectInResult
     },
     view.filter.FilterObjectIn
@@ -942,7 +944,7 @@ export function createModel (builder: Builder): void {
     core.space.Model,
     {
       label: view.string.ExactDate,
-      selectedLabel: view.string.FilterIsEither,
+      selectedLabel: view.string.FilterIsEitherPlural,
       result: view.function.FilterDateCustom
     },
     view.filter.FilterDateCustom

packages/text-editor/lang/ru.json

@@ -38,7 +38,7 @@
     "Table": "Таблица",
     "InsertTable": "Добавить таблицу",
     "TableOptions": "Настроить таблицу",
-    "Width": "Щирина",
+    "Width": "Ширина",
     "Height": "Высота",
     "Unset": "Убрать"
   }

plugins/gmail-resources/src/components/Main.svelte

@@ -58,6 +58,9 @@
     },
     (res) => {
       channel = res[0]
+      if (channel !== undefined) {
+        notificationClient.forceRead(channel._id, channel._class)
+      }
     }
   )
 
@@ -77,9 +80,6 @@
 
   async function selectHandler (e: CustomEvent): Promise<void> {
     currentMessage = e.detail
-    if (channel !== undefined) {
-      await notificationClient.read(channel._id)
-    }
   }
 
   const settingsQuery = createQuery()

plugins/gmail-resources/src/components/NewMessage.svelte

@@ -73,7 +73,7 @@
       },
       objectId
     )
-    await notificationClient.read(channel._id)
+    await notificationClient.forceRead(channel._id, channel._class)
     objectId = generateId()
     dispatch('close')
   }

plugins/gmail-resources/src/components/NewMessages.svelte

@@ -92,7 +92,7 @@
           .map((m) => m.trim())
           .filter((m) => m.length)
       })
-      await notificationClient.read(channel._id)
+      await notificationClient.forceRead(channel._id, channel._class)
       for (const attachment of attachments) {
         await client.addCollection(
           attachmentP.class.Attachment,

plugins/telegram-resources/src/components/Chat.svelte

@@ -110,7 +110,7 @@
       (res) => {
         messages = res.reverse()
         if (channel !== undefined) {
-          notificationClient.read(channel._id)
+          notificationClient.forceRead(channel._id, channel._class)
         }
       },
       {
@@ -171,7 +171,7 @@
       }
     )
     if (channel !== undefined) {
-      await notificationClient.read(channel._id)
+      await notificationClient.forceRead(channel._id, channel._class)
     }
     clear()
   }

plugins/view-assets/lang/en.json

@@ -49,6 +49,7 @@
     "ClearFilters": "Clear filters",
     "FilterIsNot": "is not",
     "FilterIsEither": "is",
+    "FilterIsEitherPlural": "is",
     "FilterStatesCount": "{value, plural, =1 {1 state} other {# states}}",
     "FilterUpdated": "Filter was updated",
     "FilterRemoved": "{count, plural, =1 {# non-existing value was} other {# non-existing values were}} removed from the filter",

plugins/view-assets/lang/ru.json

@@ -45,7 +45,8 @@
     "Filter": "Фильтр",
     "ClearFilters": "Очистить",
     "FilterIsNot": "не равен",
-    "FilterIsEither": "{value, plural, =1 {равен} other {один из}}",
+    "FilterIsEither": "равен",
+    "FilterIsEitherPlural": "{value, plural, =1 {равен} other {один из}}",
     "FilterStatesCount": "{value, plural, =1 {1 состоянию} other {# состояний}}",
     "FilterUpdated": "Фильтр был обновлен",
     "FilterRemoved": "Несуществующие значения были удалены из фильтра: {count}",

plugins/view-resources/src/plugin.ts

@@ -52,6 +52,7 @@ export default mergeIds(viewId, view, {
     ClearFilters: '' as IntlString,
     FilterIsNot: '' as IntlString,
     FilterIsEither: '' as IntlString,
+    FilterIsEitherPlural: '' as IntlString,
     FilterArrayAll: '' as IntlString,
     FilterArrayAny: '' as IntlString,
     FilterStatesCount: '' as IntlString,