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

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

View File

@ -28,6 +28,7 @@
"Folders": "Folders",
"FormTemplates": "Form templates",
"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",
"MobileAndroid": "Get ONLYOFFICE Documents on Google Play",
"MobileIos": "Download ONLYOFFICE Documents on the App Store",

View File

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

View File

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

View File

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