IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0

Browse Source
This commit is contained in:
Tatiana Lopaeva 2023-01-20 17:36:25 +03:00
commit 42b4d7c20c
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/client/public/locales/en/Translations.json
View File

@ -28,6 +28,7 @@
"Folders": "Folders", "Folders": "Folders",
"FormTemplates": "Form templates", "FormTemplates": "Form templates",
"LinkCopySuccess": "Link has been copied to the clipboard", "LinkCopySuccess": "Link has been copied to the clipboard",
"LinkValidTime": "This link is valid for {{days_count}} days only",
"MediaLoadError": "Media file could not be loaded", "MediaLoadError": "Media file could not be loaded",
"MobileAndroid": "Get ONLYOFFICE Documents on Google Play", "MobileAndroid": "Get ONLYOFFICE Documents on Google Play",
"MobileIos": "Download ONLYOFFICE Documents on the App Store", "MobileIos": "Download ONLYOFFICE Documents on the App Store",

1
packages/client/public/locales/ru/Translations.json
View File

@ -28,6 +28,7 @@
"Folders": "Папки", "Folders": "Папки",
"FormTemplates": "Шаблоны форм", "FormTemplates": "Шаблоны форм",
"LinkCopySuccess": "Ссылка скопирована в буфер обмена", "LinkCopySuccess": "Ссылка скопирована в буфер обмена",
"LinkValidTime": "Эта ссылка действительна только {{days_count}} дней",
"MediaLoadError": "Медиа файл не может быть загружен", "MediaLoadError": "Медиа файл не может быть загружен",
"MobileAndroid": "Скачать ONLYOFFICE Документы в Google Play", "MobileAndroid": "Скачать ONLYOFFICE Документы в Google Play",
"MobileIos": "Скачать ONLYOFFICE Документы в App Store", "MobileIos": "Скачать ONLYOFFICE Документы в App Store",

7
packages/client/src/components/panels/InvitePanel/sub-components/ExternalLinks.js
View File

@ -72,7 +72,12 @@ const ExternalLinks = ({
const copyLink = (link) => { const copyLink = (link) => {
if (link) { if (link) {
toastr.success(t("Translations:LinkCopySuccess")); toastr.success(
`${t("Translations:LinkCopySuccess")}. ${t(
"Translations:LinkValidTime",
{ days_count: 7 }
)}`
);
copy(link); copy(link);
} }
}; };

2
packages/client/src/store/FilesActionsStore.js
View File

@ -1902,7 +1902,7 @@ class FilesActionStore {
) )
: null; : null;
return openDocEditor(id, providerKey, tab); return openDocEditor(id, providerKey, tab, null, !canWebEdit);
} }
if (isMediaOrImage) { if (isMediaOrImage) {