From daef96dcb31cec9e8b7de8b4e9c51bdefa0fede6 Mon Sep 17 00:00:00 2001 From: Pranam Lashkari Date: Mon, 30 Aug 2021 16:21:02 +0530 Subject: [PATCH] freemium: corrected typos Signed-off-by: Pranam Lashkari Change-Id: If21f4471b3ad4b20f049e2e9f2330e31989ead0b --- common/Freemium.hpp | 2 +- configure.ac | 18 +++++++++--------- loleaflet/src/control/Control.Freemium.js | 6 +++--- wsd/DocumentBroker.cpp | 2 +- wsd/LOOLWSD.cpp | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/common/Freemium.hpp b/common/Freemium.hpp index 599bc0cc8..606bd5e7b 100644 --- a/common/Freemium.hpp +++ b/common/Freemium.hpp @@ -32,7 +32,7 @@ public: static std::string getFreemiumPurchaseTitle() { return config::getString("freemium.purchase_title", ""); } static std::string getFreemiumPurchaseLink() { return config::getString("freemium.purchase_link", ""); } - static std::string getFreemiumPurchaseDiscription() { return config::getString("freemium.purchase_discription", ""); } + static std::string getFreemiumPurchaseDescription() { return config::getString("freemium.purchase_description", ""); } static std::string getWriterHighlights() { return config::getString("freemium.writer_subscription_highlights", ""); } static std::string getCalcHighlights() { return config::getString("freemium.calc_subscription_highlights", ""); } static std::string getImpressHighlights() { return config::getString("freemium.impress_subscription_highlights", ""); } diff --git a/configure.ac b/configure.ac index cf2acd903..d7f3be92d 100644 --- a/configure.ac +++ b/configure.ac @@ -1314,12 +1314,12 @@ fi AC_DEFINE_UNQUOTED([PURCHASE_LINK],["$PURCHASE_LINK"],[Default value of freemium.purchase_link]) AC_SUBST(PURCHASE_LINK) -PURCHASE_DISCRIPTION= +PURCHASE_DESCRIPTION= if test "$enable_freemium" = "yes"; then - PURCHASE_DISCRIPTION="Head over to the subscription page and discover all the features:" + PURCHASE_DESCRIPTION="Head over to the subscription page and discover all the features:" fi -AC_DEFINE_UNQUOTED([PURCHASE_DISCRIPTION],["$PURCHASE_DISCRIPTION"],[Default value of freemium.purchase_discription]) -AC_SUBST(PURCHASE_DISCRIPTION) +AC_DEFINE_UNQUOTED([PURCHASE_DESCRIPTION],["$PURCHASE_DESCRIPTION"],[Default value of freemium.purchase_description]) +AC_SUBST(PURCHASE_DESCRIPTION) WRITER_SUBSCRIPTION_HIGHLIGHTS= if test "$enable_freemium" = "yes"; then @@ -1355,11 +1355,11 @@ if test "$enable_freemium" = "yes"; then $DISABLED_COMMANDS $PURCHASE_TITLE $PURCHASE_LINK - $PURCHASE_DISCRIPTION - $WRITER_SUBSCRIPTION_HIGHLIGHTS - $CALC_SUBSCRIPTION_HIGHLIGHTS - $IMPRESS_SUBSCRIPTION_HIGHLIGHTS - $DRAW_SUBSCRIPTION_HIGHLIGHTS + $PURCHASE_DESCRIPTION + $WRITER_SUBSCRIPTION_HIGHLIGHTS + $CALC_SUBSCRIPTION_HIGHLIGHTS + $IMPRESS_SUBSCRIPTION_HIGHLIGHTS + $DRAW_SUBSCRIPTION_HIGHLIGHTS " fi diff --git a/loleaflet/src/control/Control.Freemium.js b/loleaflet/src/control/Control.Freemium.js index 458c6b54a..c7ff5ff0a 100644 --- a/loleaflet/src/control/Control.Freemium.js +++ b/loleaflet/src/control/Control.Freemium.js @@ -11,7 +11,7 @@ L.Map.include({ freemiumDenyList: [], freemiumPurchaseTitle: '', freemiumPurchaseLink: '', - freemiumPurchaseDiscription: '', + freemiumPurchaseDescription: '', writerHighlights: '', calcHighlights: '', impressHighlights: '', @@ -23,7 +23,7 @@ L.Map.include({ this.Freemium.freemiumDenyList = freemiumInfo['FreemiumDenyList']; this.Freemium.freemiumPurchaseTitle = _(freemiumInfo['FreemiumPurchaseTitle']); this.Freemium.freemiumPurchaseLink = _(freemiumInfo['FreemiumPurchaseLink']); - this.Freemium.freemiumPurchaseDiscription = _(freemiumInfo['FreemiumPurchaseDiscription']); + this.Freemium.freemiumPurchaseDescription = _(freemiumInfo['FreemiumPurchaseDescription']); this.Freemium.writerHighlights = _(freemiumInfo['WriterHighlights']); this.Freemium.calcHighlights = _(freemiumInfo['CalcHighlights']); this.Freemium.impressHighlights = _(freemiumInfo['ImpressHighlights']); @@ -67,7 +67,7 @@ L.Map.include({ '
', '
', '

' + this.Freemium.freemiumPurchaseTitle + '

', - '

' + this.Freemium.freemiumPurchaseDiscription + '

', + '

' + this.Freemium.freemiumPurchaseDescription + '

', '

    ', '
  • ' + this.Freemium.writerHighlights + '
  • ', '
  • ' + this.Freemium.calcHighlights + '
  • ', diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 6308c64d2..eea265bbc 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -809,7 +809,7 @@ bool DocumentBroker::download(const std::shared_ptr& session, con freemiumInfo->set("FreemiumDenyList", Freemium::FreemiumManager::getFreemiumDenyList()); freemiumInfo->set("FreemiumPurchaseTitle", Freemium::FreemiumManager::getFreemiumPurchaseTitle()); freemiumInfo->set("FreemiumPurchaseLink", Freemium::FreemiumManager::getFreemiumPurchaseLink()); - freemiumInfo->set("FreemiumPurchaseDiscription", Freemium::FreemiumManager::getFreemiumPurchaseDiscription()); + freemiumInfo->set("FreemiumPurchaseDescription", Freemium::FreemiumManager::getFreemiumPurchaseDescription()); freemiumInfo->set("WriterHighlights", Freemium::FreemiumManager::getWriterHighlights()); freemiumInfo->set("CalcHighlights", Freemium::FreemiumManager::getCalcHighlights()); freemiumInfo->set("ImpressHighlights", Freemium::FreemiumManager::getImpressHighlights()); diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 8062365ec..710a54727 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -1038,7 +1038,7 @@ void LOOLWSD::innerInitialize(Application& self) { "freemium.disabled_commands", DISABLED_COMMANDS }, { "freemium.purchase_title", PURCHASE_TITLE }, { "freemium.purchase_link", PURCHASE_LINK }, - { "freemium.purchase_discription", PURCHASE_DISCRIPTION }, + { "freemium.purchase_description", PURCHASE_DESCRIPTION }, { "freemium.writer_subscription_highlights", WRITER_SUBSCRIPTION_HIGHLIGHTS }, { "freemium.calc_subscription_highlights", CALC_SUBSCRIPTION_HIGHLIGHTS }, { "freemium.impress_subscription_highlights", IMPRESS_SUBSCRIPTION_HIGHLIGHTS },