cui/inc/strings.hrc | 2 +- cui/source/dialogs/about.cxx | 2 +- officecfg/registry/data/org/openoffice/Office/Common.xcu | 3 +++ officecfg/registry/schema/org/openoffice/Office/Common.xcs | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-)
New commits: commit 96607133f4457b31ddaee5808c04e96243ed99c6 Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de> AuthorDate: Thu Jan 20 13:05:39 2022 +0100 Commit: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de> CommitDate: Thu Jan 20 16:45:32 2022 +0100 Move credits link to config as all other related URLs and replace with a hub link, see https://redmine.documentfoundation.org/issues/3569 Change-Id: Ic30f2a5980ae17b5dfff184ead391b21cff7ab7c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128660 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de> diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc index eb7d701db964..df987aa0501e 100644 --- a/cui/inc/strings.hrc +++ b/cui/inc/strings.hrc @@ -367,7 +367,6 @@ #define RID_CUISTR_CANNOTCONVERTURL_ERR NC_("RID_SVXSTR_CANNOTCONVERTURL_ERR", "The URL <%1> cannot be converted to a filesystem path.") #define RID_CUISTR_ABOUT_COPYRIGHT NC_("aboutdialog|copyright", "Copyright © 2000–2022 LibreOffice contributors.") -#define RID_CUISTR_ABOUT_CREDITS_URL NC_("aboutdialog|link", "https://www.libreoffice.org/about-us/credits/") #define RID_CUISTR_ABOUT_VENDOR NC_("aboutdialog|vendor", "This release was supplied by %OOOVENDOR.") #define RID_CUISTR_ABOUT_BASED_ON NC_("aboutdialog|libreoffice", "LibreOffice was based on OpenOffice.org.") #define RID_CUISTR_ABOUT_DERIVED NC_("aboutdialog|derived", "%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org") @@ -403,4 +402,5 @@ #define RID_CUISTR_CLICK_RESULT NC_("RID_CUISTR_CLICK_RESULT", "(Click on any test to view its resultant bitmap image)") #define RID_CUISTR_ZIPFAIL NC_("RID_CUISTR_ZIPFAIL", "Creation of Zip file failed!") #define RID_CUISTR_SAVED NC_("RID_CUISTR_SAVED", "The results have been successfully saved in the file 'GraphicTestResults.zip'!") + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index ae17508cebcd..dd5df31db6ae 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -117,7 +117,7 @@ AboutDialog::AboutDialog(weld::Window *pParent) } // Links - m_pCreditsButton->set_uri(CuiResId(RID_CUISTR_ABOUT_CREDITS_URL)); + m_pCreditsButton->set_uri(officecfg::Office::Common::Menus::CreditsURL::get()); OUString sURL(officecfg::Office::Common::Help::StartCenter::InfoURL::get()); localizeWebserviceURI(sURL); diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index f543b6ebb3c9..4694135efce7 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -360,6 +360,9 @@ <prop oor:name="ReleaseNotesURL" oor:type="xs:string"> <value>https://hub.libreoffice.org/ReleaseNotes/</value> </prop> + <prop oor:name="CreditsURL" oor:type="xs:string"> + <value>https://hub.libreoffice.org/credits/</value> + </prop> <prop oor:name="HyphenationMissingURL" oor:type="xs:string"> <value>https://hub.libreoffice.org/HyphenationMissing/</value> </prop> diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 2f3846e4e8bf..dd896317adda 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2103,6 +2103,11 @@ <desc>Specifies the URL used with the UNO command WhatsNew (SID_WHATSNEW).</desc> </info> </prop> + <prop oor:name="CreditsURL" oor:type="xs:string" oor:nillable="false"> + <info> + <desc>Specifies the URL for the LibreOffice Credits page.</desc> + </info> + </prop> <prop oor:name="HyphenationMissingURL" oor:type="xs:string" oor:nillable="false"> <info> <desc>Specifies the URL used with the UNO command HyphenationMissing (SID_HYPHENATIONMISSING).</desc>