Replacing two dots in a sentence, deleted useless code.
This commit is contained in:
parent
e0705efdbd
commit
b5bd0b21fa
@ -98,7 +98,6 @@ export default inject<TStore>(
|
||||
isLicenseExpiring,
|
||||
isLicenseDateExpired,
|
||||
trialDaysLeft,
|
||||
paymentDate,
|
||||
} = currentTariffStatusStore;
|
||||
|
||||
return {
|
||||
@ -121,7 +120,6 @@ export default inject<TStore>(
|
||||
isTrial,
|
||||
isLicenseDateExpired,
|
||||
trialDaysLeft,
|
||||
paymentDate,
|
||||
|
||||
toggleArticleOpen,
|
||||
|
||||
|
@ -31,6 +31,7 @@ import { useTranslation } from "react-i18next";
|
||||
import { Text } from "@docspace/shared/components/text";
|
||||
import { StyledTitleComponent } from "../StyledComponent";
|
||||
import { PRODUCT_NAME } from "@docspace/shared/constants";
|
||||
import { getTwoDotsReplacing } from "../../utils";
|
||||
|
||||
const TariffTitleContainer = ({
|
||||
isLicenseDateExpired,
|
||||
@ -72,13 +73,18 @@ const TariffTitleContainer = ({
|
||||
|
||||
const expiresDate = () => {
|
||||
if (isTrial) {
|
||||
return t("ActivateTariffEnterpriseTrialExpiration", {
|
||||
date: paymentDate,
|
||||
});
|
||||
return getTwoDotsReplacing(
|
||||
t("ActivateTariffEnterpriseTrialExpiration", {
|
||||
date: paymentDate,
|
||||
}),
|
||||
);
|
||||
}
|
||||
return t("ActivateTariffEnterpriseExpiration", {
|
||||
date: paymentDate,
|
||||
});
|
||||
|
||||
return getTwoDotsReplacing(
|
||||
t("ActivateTariffEnterpriseExpiration", {
|
||||
date: paymentDate,
|
||||
}),
|
||||
);
|
||||
};
|
||||
|
||||
return (
|
||||
|
@ -0,0 +1,31 @@
|
||||
// (c) Copyright Ascensio System SIA 2009-2024
|
||||
//
|
||||
// This program is a free software product.
|
||||
// You can redistribute it and/or modify it under the terms
|
||||
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
|
||||
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
|
||||
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
|
||||
// any third-party rights.
|
||||
//
|
||||
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
|
||||
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
|
||||
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
|
||||
//
|
||||
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
|
||||
//
|
||||
// The interactive user interfaces in modified source and object code versions of the Program must
|
||||
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
|
||||
//
|
||||
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
|
||||
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
|
||||
// trademark law for use of our trademarks.
|
||||
//
|
||||
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
|
||||
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
|
||||
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
|
||||
export function getTwoDotsReplacing(translation: string) {
|
||||
const newTranslation = translation;
|
||||
|
||||
return newTranslation.replace(/\..$/, ".");
|
||||
}
|
@ -145,6 +145,5 @@ export interface ArticleProps {
|
||||
standalone?: boolean;
|
||||
currentTariffPlanTitle?: string;
|
||||
trialDaysLeft?: number;
|
||||
paymentDate?: Date;
|
||||
organizationName: string;
|
||||
}
|
||||
|
@ -102,7 +102,6 @@ const Article = ({
|
||||
standalone,
|
||||
currentTariffPlanTitle,
|
||||
trialDaysLeft,
|
||||
paymentDate,
|
||||
|
||||
languageBaseName,
|
||||
zendeskEmail,
|
||||
|
@ -122,13 +122,7 @@ class CurrentTariffStatusStore {
|
||||
moment.locale(this.language);
|
||||
if (this.dueDate === null) return "";
|
||||
|
||||
let date = moment(this.dueDate).tz(window.timezone).format("LL");
|
||||
|
||||
if (!date) return "";
|
||||
|
||||
if (date[date.length - 1] === ".") date = date.slice(0, -1);
|
||||
|
||||
return date;
|
||||
return moment(this.dueDate).tz(window.timezone).format("LL");
|
||||
}
|
||||
|
||||
get isPaymentDateValid() {
|
||||
|
Loading…
Reference in New Issue
Block a user