diff --git a/README.md b/README.md index de28bb9..0100c43 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Dailyscripture (1.1.5) +# Dailyscripture (1.2.0) Display the daily scripture from [https://git.vdm.dev/christian/daily-scripture](https://git.vdm.dev/christian/daily-scripture). @@ -10,8 +10,8 @@ Display the daily scripture from [https://git.vdm.dev/christian/daily-scripture] + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Dailyscripture](https://getbible.net) + *First Build*: 3rd December, 2015 -+ *Last Build*: 9th November, 2023 -+ *Version*: 1.1.5 ++ *Last Build*: 10th November, 2023 ++ *Version*: 1.2.0 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/helper.php b/helper.php index b008812..e6f30c6 100644 --- a/helper.php +++ b/helper.php @@ -147,6 +147,10 @@ class ModDailyScriptureHelper { return $this->scripture->{$key}; } + elseif ($this->type == 1 && $key === 'local_link') + { + return $this->getLocalLink(); + } elseif ($this->type == 2 && $key === 'telegram') { return $this->getTelegram(); @@ -159,6 +163,25 @@ class ModDailyScriptureHelper return null; } + /** + * get the local link + * + * @return string|null + * + * @since 1.2 + */ + protected function getLocalLink(): ?string + { + if (($link = $this->params->get('local_link')) === null || + empty($this->version) || empty($this->book) || + empty($this->chapter) || empty($this->verse)) + { + return null; + } + + return "$link/{$this->version}/{$this->book}/{$this->chapter}/{$this->verse}"; + } + /** * get the Telegram script * diff --git a/language/en-GB/en-GB.mod_dailyscripture.ini b/language/en-GB/en-GB.mod_dailyscripture.ini index ae546f5..2e5bc4e 100644 --- a/language/en-GB/en-GB.mod_dailyscripture.ini +++ b/language/en-GB/en-GB.mod_dailyscripture.ini @@ -1,6 +1,6 @@ MOD_DAILYSCRIPTURE="Dailyscripture" MOD_DAILYSCRIPTURE_DESCRIPTION="A Joomla Module to Display the Daily Scripture." -MOD_DAILYSCRIPTURE_XML_DESCRIPTION="

Dailyscripture (v.1.1.5)

A Joomla Module to Display the Daily Scripture.

Created by Llewellyn van der Merwe
Development started 1st January, 2022

" +MOD_DAILYSCRIPTURE_XML_DESCRIPTION="

Dailyscripture (v.1.2.0)

A Joomla Module to Display the Daily Scripture.

Created by Llewellyn van der Merwe
Development started 1st January, 2022

" MOD_DAILYSCRIPTURE_THERE_WAS_AN_ERROR_LOADING_THE_DAILY_SCRIPTURE_PLEASE_TRY_AGAIN_LATTER="There was an error loading the Daily Scripture, please try again latter." MOD_DAILYSCRIPTURE_DAILY_SCRIPTURE="Daily Scripture" MOD_DAILYSCRIPTURE_TYPE_LABEL="Implementation Type" @@ -18,8 +18,13 @@ MOD_DAILYSCRIPTURE_COMMENTS_HEIGHT_DESCRIPTION="Use 300 for auto height. Any hig MOD_DAILYSCRIPTURE_LINK_LABEL="Show Link" MOD_DAILYSCRIPTURE_LINK_DESCRIPTION="Should we show a link." MOD_DAILYSCRIPTURE_GETBIBLE="GetBible" +MOD_DAILYSCRIPTURE_LOCAL_GETBIBLE="Local GetBible" MOD_DAILYSCRIPTURE_TELEGRAM="Telegram" MOD_DAILYSCRIPTURE_NONE="None" +MOD_DAILYSCRIPTURE_LOCAL_LINK_LABEL="Local getBible Link" +MOD_DAILYSCRIPTURE_LOCAL_LINK_DESCRIPTION="The link to the local getBible app page." +MOD_DAILYSCRIPTURE_LOCAL_LINK_MESSAGE="Error! Please add some local getBible link here." +MOD_DAILYSCRIPTURE_LOCAL_LINK_HINT="https://truechristian.church/scriptures" MOD_DAILYSCRIPTURE_WIDTH_LABEL="Width" MOD_DAILYSCRIPTURE_AUTHOR_PHOTO_LABEL="Author Photo" MOD_DAILYSCRIPTURE_AUTO="Auto" diff --git a/language/en-GB/en-GB.mod_dailyscripture.sys.ini b/language/en-GB/en-GB.mod_dailyscripture.sys.ini index ae546f5..2e5bc4e 100644 --- a/language/en-GB/en-GB.mod_dailyscripture.sys.ini +++ b/language/en-GB/en-GB.mod_dailyscripture.sys.ini @@ -1,6 +1,6 @@ MOD_DAILYSCRIPTURE="Dailyscripture" MOD_DAILYSCRIPTURE_DESCRIPTION="A Joomla Module to Display the Daily Scripture." -MOD_DAILYSCRIPTURE_XML_DESCRIPTION="

Dailyscripture (v.1.1.5)

A Joomla Module to Display the Daily Scripture.

Created by Llewellyn van der Merwe
Development started 1st January, 2022

" +MOD_DAILYSCRIPTURE_XML_DESCRIPTION="

Dailyscripture (v.1.2.0)

A Joomla Module to Display the Daily Scripture.

Created by Llewellyn van der Merwe
Development started 1st January, 2022

" MOD_DAILYSCRIPTURE_THERE_WAS_AN_ERROR_LOADING_THE_DAILY_SCRIPTURE_PLEASE_TRY_AGAIN_LATTER="There was an error loading the Daily Scripture, please try again latter." MOD_DAILYSCRIPTURE_DAILY_SCRIPTURE="Daily Scripture" MOD_DAILYSCRIPTURE_TYPE_LABEL="Implementation Type" @@ -18,8 +18,13 @@ MOD_DAILYSCRIPTURE_COMMENTS_HEIGHT_DESCRIPTION="Use 300 for auto height. Any hig MOD_DAILYSCRIPTURE_LINK_LABEL="Show Link" MOD_DAILYSCRIPTURE_LINK_DESCRIPTION="Should we show a link." MOD_DAILYSCRIPTURE_GETBIBLE="GetBible" +MOD_DAILYSCRIPTURE_LOCAL_GETBIBLE="Local GetBible" MOD_DAILYSCRIPTURE_TELEGRAM="Telegram" MOD_DAILYSCRIPTURE_NONE="None" +MOD_DAILYSCRIPTURE_LOCAL_LINK_LABEL="Local getBible Link" +MOD_DAILYSCRIPTURE_LOCAL_LINK_DESCRIPTION="The link to the local getBible app page." +MOD_DAILYSCRIPTURE_LOCAL_LINK_MESSAGE="Error! Please add some local getBible link here." +MOD_DAILYSCRIPTURE_LOCAL_LINK_HINT="https://truechristian.church/scriptures" MOD_DAILYSCRIPTURE_WIDTH_LABEL="Width" MOD_DAILYSCRIPTURE_AUTHOR_PHOTO_LABEL="Author Photo" MOD_DAILYSCRIPTURE_AUTO="Auto" diff --git a/mod_dailyscripture.xml b/mod_dailyscripture.xml index 01aebdd..4dca4dd 100644 --- a/mod_dailyscripture.xml +++ b/mod_dailyscripture.xml @@ -1,13 +1,13 @@ MOD_DAILYSCRIPTURE - 9th November, 2023 + 10th November, 2023 Llewellyn van der Merwe joomla@vdm.io https://getbible.net Copyright (C) 2015. All Rights Reserved GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - 1.1.5 + 1.2.0 MOD_DAILYSCRIPTURE_XML_DESCRIPTION @@ -105,23 +105,41 @@ step="10" showon="show_comments:1" /> - + + + + nr; ?> text; ?> - get('link', 2) == 2): ?> + get('link', 3) == 2): ?> + date; ?> + get('link', 2) == 2): ?> date; ?> get('link', 2) == 1): ?> date; ?>