From 33c0e49705e853b766da91823f025540bd5a61b9 Mon Sep 17 00:00:00 2001 From: Maria-Sukhova Date: Mon, 7 Feb 2022 16:44:59 +0300 Subject: [PATCH 1/3] add new file (Home) (de, es, fr, it, zh-CN, ro), update ja UploadPanel --- .../ASC.Files/Client/public/locales/ja/UploadPanel.json | 6 +++++- web/ASC.Web.Client/public/locales/de/Home.json | 5 +++++ web/ASC.Web.Client/public/locales/es/Home.json | 5 +++++ web/ASC.Web.Client/public/locales/fr/Home.json | 5 +++++ web/ASC.Web.Client/public/locales/it/Home.json | 5 +++++ web/ASC.Web.Client/public/locales/ja/Home.json | 5 +++++ web/ASC.Web.Client/public/locales/ro/Home.json | 5 +++++ web/ASC.Web.Client/public/locales/zh-CN/Home.json | 5 +++++ 8 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 web/ASC.Web.Client/public/locales/de/Home.json create mode 100644 web/ASC.Web.Client/public/locales/es/Home.json create mode 100644 web/ASC.Web.Client/public/locales/fr/Home.json create mode 100644 web/ASC.Web.Client/public/locales/it/Home.json create mode 100644 web/ASC.Web.Client/public/locales/ja/Home.json create mode 100644 web/ASC.Web.Client/public/locales/ro/Home.json create mode 100644 web/ASC.Web.Client/public/locales/zh-CN/Home.json diff --git a/products/ASC.Files/Client/public/locales/ja/UploadPanel.json b/products/ASC.Files/Client/public/locales/ja/UploadPanel.json index 64547de4c1..4f284a59a0 100644 --- a/products/ASC.Files/Client/public/locales/ja/UploadPanel.json +++ b/products/ASC.Files/Client/public/locales/ja/UploadPanel.json @@ -1,3 +1,7 @@ { - "Uploads": "アップロード" + "Uploads": "アップロード", + "EnterPassword": "パスワードをご入力ください", + "HideInput": "隠す", + "Ready": "完了", + "UploadAndConvert": "ファイルをアップロードして、変換する" } \ No newline at end of file diff --git a/web/ASC.Web.Client/public/locales/de/Home.json b/web/ASC.Web.Client/public/locales/de/Home.json new file mode 100644 index 0000000000..302a033916 --- /dev/null +++ b/web/ASC.Web.Client/public/locales/de/Home.json @@ -0,0 +1,5 @@ +{ + "GoodMorning": "Guten Morgeng, {{displayName}}!", + "GoodAfternoon": "Guten Tag, {{displayName}}!", + "GoodEvening": "Guten Abend, {{displayName}}!" +} diff --git a/web/ASC.Web.Client/public/locales/es/Home.json b/web/ASC.Web.Client/public/locales/es/Home.json new file mode 100644 index 0000000000..4ef617f04b --- /dev/null +++ b/web/ASC.Web.Client/public/locales/es/Home.json @@ -0,0 +1,5 @@ +{ + "GoodMorning": "¡Buenos días, {{displayName}}!", + "GoodAfternoon": "¡Buenas tardes, {{displayName}}!", + "GoodEvening": "¡Buenas noches, {{displayName}}!" +} diff --git a/web/ASC.Web.Client/public/locales/fr/Home.json b/web/ASC.Web.Client/public/locales/fr/Home.json new file mode 100644 index 0000000000..7b7c01436e --- /dev/null +++ b/web/ASC.Web.Client/public/locales/fr/Home.json @@ -0,0 +1,5 @@ +{ + "GoodMorning": "Bonjour, {{displayName}}!", + "GoodAfternoon": "Bon après-midi, {{displayName}}!", + "GoodEvening": "Bonsoir, {{displayName}}!" +} diff --git a/web/ASC.Web.Client/public/locales/it/Home.json b/web/ASC.Web.Client/public/locales/it/Home.json new file mode 100644 index 0000000000..b15882be07 --- /dev/null +++ b/web/ASC.Web.Client/public/locales/it/Home.json @@ -0,0 +1,5 @@ +{ + "GoodMorning": "Buongiorno, {{displayName}}!", + "GoodAfternoon": "Buon pomeriggio, {{displayName}}!", + "GoodEvening": "Buonasera, {{displayName}}!" +} diff --git a/web/ASC.Web.Client/public/locales/ja/Home.json b/web/ASC.Web.Client/public/locales/ja/Home.json new file mode 100644 index 0000000000..5bd4315972 --- /dev/null +++ b/web/ASC.Web.Client/public/locales/ja/Home.json @@ -0,0 +1,5 @@ +{ + "GoodMorning": "{{displayName}}!さん、おはようございます", + "GoodAfternoon": "こんにちは{{displayName}}!さん", + "GoodEvening": "こんばんは{{displayName}}!さん" +} diff --git a/web/ASC.Web.Client/public/locales/ro/Home.json b/web/ASC.Web.Client/public/locales/ro/Home.json new file mode 100644 index 0000000000..52f03fa551 --- /dev/null +++ b/web/ASC.Web.Client/public/locales/ro/Home.json @@ -0,0 +1,5 @@ +{ + "GoodMorning": "Bună dimineața, {{displayName}}!", + "GoodAfternoon": "Bună ziua, {{displayName}}!", + "GoodEvening": "Bună seara, {{displayName}}!" +} diff --git a/web/ASC.Web.Client/public/locales/zh-CN/Home.json b/web/ASC.Web.Client/public/locales/zh-CN/Home.json new file mode 100644 index 0000000000..d7120ed454 --- /dev/null +++ b/web/ASC.Web.Client/public/locales/zh-CN/Home.json @@ -0,0 +1,5 @@ +{ + "GoodMorning": "早上好, {{displayName}}!", + "GoodAfternoon": "下午好, {{displayName}}!", + "GoodEvening": "晚上好, {{displayName}}!" +} From dc4ea0c6f8f89ff91a13c0242b073de4cfb97fa1 Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Mon, 7 Feb 2022 22:57:23 +0300 Subject: [PATCH 2/3] Files: fixed put sharedlink method --- products/ASC.Files/Core/Core/Security/FileShare.cs | 5 ++++- products/ASC.Files/Server/Helpers/FilesControllerHelper.cs | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/products/ASC.Files/Core/Core/Security/FileShare.cs b/products/ASC.Files/Core/Core/Security/FileShare.cs index 5f235acba5..d1c0e7bddd 100644 --- a/products/ASC.Files/Core/Core/Security/FileShare.cs +++ b/products/ASC.Files/Core/Core/Security/FileShare.cs @@ -23,8 +23,11 @@ * */ +using System.Text.Json.Serialization; + namespace ASC.Files.Core.Security -{ +{ + [JsonConverter(typeof(JsonStringEnumConverter))] public enum FileShare { None, diff --git a/products/ASC.Files/Server/Helpers/FilesControllerHelper.cs b/products/ASC.Files/Server/Helpers/FilesControllerHelper.cs index 8af97aeaf3..fe4cfd3b49 100644 --- a/products/ASC.Files/Server/Helpers/FilesControllerHelper.cs +++ b/products/ASC.Files/Server/Helpers/FilesControllerHelper.cs @@ -693,6 +693,7 @@ namespace ASC.Files.Helpers var aceCollection = new AceCollection { Files = new List { fileId }, + Folders = new List(0), Aces = list }; FileStorageService.SetAceObject(aceCollection, false); From 8d6818c6cdd3e07a4379933737ed174a6d427f0c Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Tue, 8 Feb 2022 16:06:25 +0300 Subject: [PATCH 3/3] Web: Client: fixed header-logo-wrapper styles --- .../src/components/NavMenu/sub-components/header.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js b/web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js index cd2176bd87..9e3b8281c9 100644 --- a/web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js +++ b/web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js @@ -49,7 +49,7 @@ const Header = styled.header` !props.isPersonal && css` @media ${tablet} { - padding-left: 4px; + display: none; } `} }