Merge branch 'hotfix/v2.6.1' of https://github.com/ONLYOFFICE/DocSpace-client into hotfix/v2.6.1

This commit is contained in:
Timofey Boyko 2024-08-23 12:05:06 +03:00
commit a6b8e53cce
3 changed files with 41 additions and 9 deletions

View File

@ -100,10 +100,18 @@ const StyledAboutBody = styled.div`
`; `;
const AboutContent = (props) => { const AboutContent = (props) => {
const { buildVersionInfo, theme, companyInfoSettingsData, previewData } = const {
props; buildVersionInfo,
const { t } = useTranslation("About"); theme,
const license = "AGPL-3.0"; companyInfoSettingsData,
previewData,
standalone,
licenseUrl,
isEnterprise,
} = props;
const { t } = useTranslation(["About", "Common"]);
const isCommercial = !standalone || isEnterprise;
const license = isCommercial ? t("Common:Commercial") : "AGPL-3.0";
const linkRepo = "https://github.com/ONLYOFFICE/DocSpace"; const linkRepo = "https://github.com/ONLYOFFICE/DocSpace";
const linkDocs = "https://github.com/ONLYOFFICE/DocumentServer"; const linkDocs = "https://github.com/ONLYOFFICE/DocumentServer";
@ -198,9 +206,25 @@ const AboutContent = (props) => {
<Text className="row-el" fontSize="13px"> <Text className="row-el" fontSize="13px">
{t("SoftwareLicense")}:{" "} {t("SoftwareLicense")}:{" "}
</Text> </Text>
<Text className="row-el" fontSize="13px" fontWeight="600"> {isCommercial ? (
&nbsp;{license} <ColorTheme
</Text> {...props}
tag="a"
themeId={ThemeId.Link}
className="row-el"
fontSize="13px"
fontWeight="600"
href={licenseUrl}
target="_blank"
enableUserSelect
>
&nbsp;{license}
</ColorTheme>
) : (
<Text className="row-el" fontSize="13px" fontWeight="600">
&nbsp;{license}
</Text>
)}
</div> </div>
<Text className="copyright" fontSize="14px" fontWeight="600"> <Text className="copyright" fontSize="14px" fontWeight="600">
@ -268,11 +292,16 @@ const AboutContent = (props) => {
); );
}; };
export default inject(({ settingsStore }) => { export default inject(({ settingsStore, currentTariffStatusStore }) => {
const { theme, companyInfoSettingsData } = settingsStore; const { theme, companyInfoSettingsData, standalone, licenseUrl } =
settingsStore;
const { isEnterprise } = currentTariffStatusStore;
return { return {
theme, theme,
companyInfoSettingsData, companyInfoSettingsData,
standalone,
licenseUrl,
isEnterprise,
}; };
})(observer(AboutContent)); })(observer(AboutContent));

View File

@ -257,6 +257,8 @@ class SettingsStore {
apiDocsLink = null; apiDocsLink = null;
licenseUrl = null;
bookTrainingEmail = null; bookTrainingEmail = null;
hotkeyPanelVisible = false; hotkeyPanelVisible = false;

View File

@ -52,6 +52,7 @@
"ComingSoon": "Coming soon", "ComingSoon": "Coming soon",
"Comment": "Comment", "Comment": "Comment",
"Comments": "Comments", "Comments": "Comments",
"Commercial": "Commercial",
"Common": "Common", "Common": "Common",
"CommonFiles": "Common files", "CommonFiles": "Common files",
"CompanyName": "Company name", "CompanyName": "Company name",