From 139275fdb9ef86a654c5c132269a2182f56986ff Mon Sep 17 00:00:00 2001 From: nate contino Date: Mon, 8 May 2023 12:36:32 -0400 Subject: [PATCH 1/9] Simplify F-Droid and Google Play download links --- _i18n/en/general/download.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_i18n/en/general/download.md b/_i18n/en/general/download.md index 5050b9d4b..78be4d666 100644 --- a/_i18n/en/general/download.md +++ b/_i18n/en/general/download.md @@ -7,6 +7,7 @@ Get it on Google Play " + url="https://play.google.com/store/apps/details?id=de.danoeh.antennapod" loc="/assets/images/badges" file="get-it-on-google-play.png" width="170" @@ -20,6 +21,7 @@ Get it on F-Droid " + url="https://f-droid.org/packages/de.danoeh.antennapod/" loc="/assets/images/badges" file="get-it-on-fdroid.png" width="170" @@ -31,7 +33,7 @@ Official versions of AntennaPod are available on Google Play and F-Droid: -[{{ img-GP | strip }}](https://play.google.com/store/apps/details?id=de.danoeh.antennapod) [{{ img-FD | strip }}](https://f-droid.org/packages/de.danoeh.antennapod/) +{{ img-GP | strip }} {{ img-FD | strip }} AntennaPod is only officially published in above two app stores because we don't have the time to support more. All other stores listing AntennaPod copied the app without our explicit permission. We are not responsible for updating those or making sure they work correctly. The F-Droid repository is not maintained by us, but by the people behind F-Droid. F-Droid usually takes a few days until updates get available ([read more](/documentation/general/f-droid)). If an update is still not available more than a week after its release, feel free to let us know by creating a post on our [forum](https://forum.antennapod.org/)), and we'll investigate it. From 1d20805d4de894f220451d653ebec15b4c885406 Mon Sep 17 00:00:00 2001 From: nate contino Date: Mon, 8 May 2023 12:37:21 -0400 Subject: [PATCH 2/9] Add URL parameter to image include --- _includes/image.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_includes/image.html b/_includes/image.html index 3f7b07309..747812d5e 100644 --- a/_includes/image.html +++ b/_includes/image.html @@ -2,6 +2,7 @@ {%- capture english-url %}{{ include.loc }}/en/{{ include.file }}{% endcapture %} {%- capture single-url %}{{ include.loc }}/{{ include.file }}{% endcapture %} {%- assign img-alt = include.alt | remove:'' | strip %} +{%- assign img-url = include.url %} {%- for file in site.static_files %} {%- if file.path == native-url %} @@ -21,7 +22,7 @@ {%- endif %} {%- endcapture -%} - + {{ img-alt }} Date: Mon, 8 May 2023 12:40:16 -0400 Subject: [PATCH 3/9] Fix image display for DE i18n download page --- _i18n/de/general/download.md | 37 ++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/_i18n/de/general/download.md b/_i18n/de/general/download.md index 2449155b1..02d6b27ac 100644 --- a/_i18n/de/general/download.md +++ b/_i18n/de/general/download.md @@ -1,26 +1,39 @@ -{% capture img-GP %} {% include image.html alt=" + +{% capture img-GP %} +{% include image.html + alt=" + Hole es dir auf Google Play " - -loc="/assets/images/badges" file="get-it-on-google-play.png" width="170" %} {% -endcapture %} - -{% capture img-FD %} {% include image.html alt=" - + url="https://play.google.com/store/apps/details?id=de.danoeh.antennapod" + loc="/assets/images/badges" + file="get-it-on-google-play.png" + width="170" +%} +{% endcapture %} + +{% capture img-FD %} +{% include image.html + alt=" + Hole es dir auf F-Droid " + url="https://f-droid.org/packages/de.danoeh.antennapod/" + loc="/assets/images/badges" + file="get-it-on-fdroid.png" + width="170" +%} +{% endcapture %} -loc="/assets/images/badges" file="get-it-on-fdroid.png" width="170" %} {% -endcapture %} + Offizielle Versionen von AntennaPod sind auf Google Play und F-Droid verfügbar: -[{{ img-GP | strip }}](https://play.google.com/store/apps/details? -id=de.danoeh.antennapod) [{{ img-FD | -strip }}](https://f-droid.org/packages/de.danoeh.antennapod/) + +{{ img-GP | strip }} {{ img-FD | strip }} AntennaPod wird offiziell nur in den beiden oben genannten App Stores veröffentlicht, da wir nicht die Zeit haben, mehr zu unterstützen. Alle anderen, From ea941522823a58eb40e4daa9f9509ea9e3f214da Mon Sep 17 00:00:00 2001 From: nate contino Date: Mon, 8 May 2023 12:42:43 -0400 Subject: [PATCH 4/9] Fix download page image display for DA i18n --- _i18n/da/general/download.md | 37 +++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/_i18n/da/general/download.md b/_i18n/da/general/download.md index e6dd73855..6be8166d1 100644 --- a/_i18n/da/general/download.md +++ b/_i18n/da/general/download.md @@ -1,26 +1,37 @@ -{% capture img-GP %} {% include image.html alt=" + +{% capture img-GP %} +{% include image.html + alt=" + Få den på Google Play " - -loc="/assets/images/badges" file="get-it-on-google-play.png" width="170" %} {% -endcapture %} - -{% capture img-FD %} {% include image.html alt=" - + url="https://play.google.com/store/apps/details?id=de.danoeh.antennapod" + loc="/assets/images/badges" + file="get-it-on-google-play.png" + width="170" +%} +{% endcapture %} + +{% capture img-FD %} +{% include image.html + alt=" + Få den på F-Droid " - -loc="/assets/images/badges" file="get-it-on-fdroid.png" width="170" %} {% -endcapture %} + url="https://f-droid.org/packages/de.danoeh.antennapod/" + loc="/assets/images/badges" + file="get-it-on-fdroid.png" + width="170" +%} +{% endcapture %} Officielle versioner af AntennaPod er tilgængelige på Google Play og F-Droid: -[{{ img-GP | strip }}](https://play.google.com/store/apps/details? -id=de.danoeh.antennapod) [{{ img-FD | -strip }}](https://f-droid.org/packages/de.danoeh.antennapod/) + +{{ img-GP | strip }} {{ img-FD | strip }} AntennaPod udgives kun officielt i de to ovennævnte butikker, da vi ikke har tid til at understøtte flere. Alle andre butikker, der tilbyder AntennaPod, har From d2b12a0eab87a833788f1b4da99137d454eacfe7 Mon Sep 17 00:00:00 2001 From: nate contino Date: Mon, 8 May 2023 12:44:12 -0400 Subject: [PATCH 5/9] Fix download image display on ES i18n page --- _i18n/es/general/download.md | 37 ++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/_i18n/es/general/download.md b/_i18n/es/general/download.md index 7dacd44f6..2c9bfbd17 100644 --- a/_i18n/es/general/download.md +++ b/_i18n/es/general/download.md @@ -1,26 +1,39 @@ -{% capture img-GP %} {% include image.html alt=" + +{% capture img-GP %} +{% include image.html + alt=" + Disponible en Google Play " - -loc="/assets/images/badges" file="get-it-on-google-play.png" width="170" %} {% -endcapture %} - -{% capture img-FD %} {% include image.html alt=" - + url="https://play.google.com/store/apps/details?id=de.danoeh.antennapod" + loc="/assets/images/badges" + file="get-it-on-google-play.png" + width="170" +%} +{% endcapture %} + +{% capture img-FD %} +{% include image.html + alt=" + Disponible en F-Droid " + url="https://f-droid.org/packages/de.danoeh.antennapod/" + loc="/assets/images/badges" + file="get-it-on-fdroid.png" + width="170" +%} +{% endcapture %} -loc="/assets/images/badges" file="get-it-on-fdroid.png" width="170" %} {% -endcapture %} + Puedes descargar versiones oficiales de AntennaPod en Google Play y en F-Droid: -[{{ img-GP | strip }}](https://play.google.com/store/apps/details? -id=de.danoeh.antennapod) [{{ img-FD | -strip }}](https://f-droid.org/packages/de.danoeh.antennapod/) + +{{ img-GP | strip }} {{ img-FD | strip }} AntennaPod solo está publicado de manera oficial en las dos tiendas de arriba porque no tenemos tiempo para estar en más. Todas las otras tiendas que listen From 4df0a6a470dbe4870a1f7d8cb00f3a52c1704876 Mon Sep 17 00:00:00 2001 From: nate contino Date: Mon, 8 May 2023 12:45:21 -0400 Subject: [PATCH 6/9] Fix download page image display for IT i18n --- _i18n/it/general/download.md | 37 ++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/_i18n/it/general/download.md b/_i18n/it/general/download.md index e3ea28e9a..71392cb90 100644 --- a/_i18n/it/general/download.md +++ b/_i18n/it/general/download.md @@ -1,26 +1,39 @@ -{% capture img-GP %} {% include image.html alt=" + +{% capture img-GP %} +{% include image.html + alt=" + Scaricala da Google Play " - -loc="/assets/images/badges" file="get-it-on-google-play.png" width="170" %} {% -endcapture %} - -{% capture img-FD %} {% include image.html alt=" - + url="https://play.google.com/store/apps/details?id=de.danoeh.antennapod" + loc="/assets/images/badges" + file="get-it-on-google-play.png" + width="170" +%} +{% endcapture %} + +{% capture img-FD %} +{% include image.html + alt=" + Scaricala da F-Droid " + url="https://f-droid.org/packages/de.danoeh.antennapod/" + loc="/assets/images/badges" + file="get-it-on-fdroid.png" + width="170" +%} +{% endcapture %} -loc="/assets/images/badges" file="get-it-on-fdroid.png" width="170" %} {% -endcapture %} + Le versioni ufficiali di AntennaPod sono disponibili su Google Play e F-Droid: -[{{ img-GP | strip }}](https://play.google.com/store/apps/details? -id=de.danoeh.antennapod) [{{ img-FD | -strip }}](https://f-droid.org/packages/de.danoeh.antennapod/) + +{{ img-GP | strip }} {{ img-FD | strip }} AntennaPod è pubblicato ufficialmente solo su questi due app store perché non abbiamo il tempo di supportarne altri. Tutti gli altri store che hanno in From 310f8781ce8f8cdad1299389d0f01b02a8b5d4a5 Mon Sep 17 00:00:00 2001 From: nate contino Date: Mon, 8 May 2023 12:46:28 -0400 Subject: [PATCH 7/9] Fix download page image display for NL i18n --- _i18n/nl/general/download.md | 37 ++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/_i18n/nl/general/download.md b/_i18n/nl/general/download.md index afc9a5f63..9fe01c280 100644 --- a/_i18n/nl/general/download.md +++ b/_i18n/nl/general/download.md @@ -1,26 +1,39 @@ -{% capture img-GP %} {% include image.html alt=" + +{% capture img-GP %} +{% include image.html + alt=" + Download het op Google Play " - -loc="/assets/images/badges" file="get-it-on-google-play.png" width="170" %} {% -endcapture %} - -{% capture img-FD %} {% include image.html alt=" - + url="https://play.google.com/store/apps/details?id=de.danoeh.antennapod" + loc="/assets/images/badges" + file="get-it-on-google-play.png" + width="170" +%} +{% endcapture %} + +{% capture img-FD %} +{% include image.html + alt=" + Download het op F-Droid " + url="https://f-droid.org/packages/de.danoeh.antennapod/" + loc="/assets/images/badges" + file="get-it-on-fdroid.png" + width="170" +%} +{% endcapture %} -loc="/assets/images/badges" file="get-it-on-fdroid.png" width="170" %} {% -endcapture %} + Officiële versies van AntennaPod zijn beschikbaar via Google Play en F-Droid: -[{{ img-GP | strip }}](https://play.google.com/store/apps/details? -id=de.danoeh.antennapod) [{{ img-FD | -strip }}](https://f-droid.org/packages/de.danoeh.antennapod/) + +{{ img-GP | strip }} {{ img-FD | strip }} AntennaPod is alleen officieel gepubliceerd in de twee bovengenoemde winkels omdat we geen tijd hebben om de app op meer plekken publiceren. Alle andere From 9477052c1a0bda2b7bd947c369a587242e8abf9d Mon Sep 17 00:00:00 2001 From: nate contino Date: Mon, 8 May 2023 12:48:40 -0400 Subject: [PATCH 8/9] Fix download page image links in FR i18n --- _i18n/fr/general/download.md | 39 ++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/_i18n/fr/general/download.md b/_i18n/fr/general/download.md index c125ca6c2..96e5a30de 100644 --- a/_i18n/fr/general/download.md +++ b/_i18n/fr/general/download.md @@ -1,27 +1,40 @@ -{% capture img-GP %} {% include image.html alt=" + +{% capture img-GP %} +{% include image.html + alt=" + Téléchargez-le sur Google Play " - -loc="/assets/images/badges" file="get-it-on-google-play.png" width="170" %} {% -endcapture %} - -{% capture img-FD %} {% include image.html alt=" - + url="https://play.google.com/store/apps/details?id=de.danoeh.antennapod" + loc="/assets/images/badges" + file="get-it-on-google-play.png" + width="170" +%} +{% endcapture %} + +{% capture img-FD %} +{% include image.html + alt=" + Téléchargez-le sur F-Droid " + url="https://f-droid.org/packages/de.danoeh.antennapod/" + loc="/assets/images/badges" + file="get-it-on-fdroid.png" + width="170" +%} +{% endcapture %} -loc="/assets/images/badges" file="get-it-on-fdroid.png" width="170" %} {% -endcapture %} + Vous pouvez télécharger les versions officielles d'AntennaPod sur Google Play et -sur F-Droid : +sur F-Droid: -[{{ img-GP | strip }}](https://play.google.com/store/apps/details? -id=de.danoeh.antennapod) [{{ img-FD | -strip }}](https://f-droid.org/packages/de.danoeh.antennapod/) + +{{ img-GP | strip }} {{ img-FD | strip }} AntennaPod n'est officiellement publié que dans les deux AppStores pré-cités, car nous n'avons pas le temps d'en gérer davantage. Tous les autres AppStores From 040a87c8913dcd9198de91e9937f43af382c5851 Mon Sep 17 00:00:00 2001 From: nate contino Date: Mon, 8 May 2023 12:56:20 -0400 Subject: [PATCH 9/9] Add image URL detection so images with URLs link to URL on click --- _includes/image.html | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/_includes/image.html b/_includes/image.html index 747812d5e..245444812 100644 --- a/_includes/image.html +++ b/_includes/image.html @@ -22,11 +22,22 @@ {%- endif %} {%- endcapture -%} - +{%- if include.url %} + {{ img-alt }} + class="rounded {{ include.class }}"> + +{% else %} + + {{ img-alt }} + +{% endif %}