From 1348a7e29890cf2f75f2bd781d7be8816da4af4a Mon Sep 17 00:00:00 2001 From: Angel M Miguel Date: Thu, 7 Nov 2024 12:19:06 +0100 Subject: [PATCH 1/3] Introduce LAMP in the browser --- download_builder.rb | 2 +- downloads.yml | 14 ++++++++++++++ en.po | 3 +++ locales/en.po | 6 +++++- locales/es.po | 4 ++++ source-common/images/browsers-logo.png | Bin 0 -> 349 bytes source/localizable/download.html.erb | 6 +++++- source/localizable/index.html.erb | 2 +- 8 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 source-common/images/browsers-logo.png diff --git a/download_builder.rb b/download_builder.rb index 5ad0b7b..3cb05b2 100644 --- a/download_builder.rb +++ b/download_builder.rb @@ -1,7 +1,7 @@ class DownloadBuilder < Middleman::Extension option :source, "./downloads.yml", "Source manifest (.yml)" - DISPLAY_ORDER = %w[windows linux apple appleVM] + DISPLAY_ORDER = %w[windows browsers linux apple appleVM] FRIENDLY_NAMES = { "apple" => "OS X", "appleVM" => "OS X (VM)", diff --git a/downloads.yml b/downloads.yml index aededd0..36fc9e6 100644 --- a/downloads.yml +++ b/downloads.yml @@ -154,3 +154,17 @@ apple: checksum_sha256: eb9888f2e3b131ae9a5fbec063a6b642a7285e065a8e5f5e97c699b71e2d7ac5 size: 150 Mb url: https://sourceforge.net/projects/xampp/files/XAMPP%20Mac%20OS%20X/8.2.4/xampp-osx-8.2.4-0-installer.dmg +browsers: +- version: 8.3.12 + php_version: 8.3.12 + whats_included: Alpine Linux 3.20, Apache 2.4.62, MariaDB 10.11-8, PHP 8.3.12 & PEAR + multibyte (mbstring) support, + Perl 5.38.2, phpMyAdmin 5.2.1 + requirements: 'Firefox, Safari, or any Chromium based browser like Google Chrome or Bing. The mobile versions for Apple iOS are not supported yet.' + downloads: + x64: + checksum_md5: Not required + checksum_sha1: Not required + checksum_sha256: Not required + size: '-' + browser_app: true + url: https://endor.dev/s/lamp diff --git a/en.po b/en.po index dc90832..ed9b804 100755 --- a/en.po +++ b/en.po @@ -24,6 +24,9 @@ msgstr "" #: en.download.whats_included msgid "What's Included?" msgstr "" +#: en.download.run_in_browser +msgid "Run in browser" +msgstr "Lanzar en el navegador" #: en.download.requirements.title msgid "Requirements" msgstr "" diff --git a/locales/en.po b/locales/en.po index 6a3d0e0..1c1b951 100755 --- a/locales/en.po +++ b/locales/en.po @@ -30,6 +30,10 @@ msgstr "" msgid "What's Included?" msgstr "What's Included?" +#: en.download.run_in_browser +msgid "Run in browser" +msgstr "Run in browser" + #: en.download.requirements.title msgid "Requirements" msgstr "Requirements" @@ -2142,4 +2146,4 @@ msgid "This is most often a symptom of the VM running on a computer with an Appl msgstr "This is most often a symptom of the VM running on a computer with an Apple M1 (arm64) CPU. The VM components do not support the M1 CPU (as of September 2022). You can only use the VM on computers with intel (x64) CPUs. On computers with the M1 CPU, please use the XAMPP native installers instead." msgid "" -msgstr "" \ No newline at end of file +msgstr "" diff --git a/locales/es.po b/locales/es.po index 502f7c6..329baec 100755 --- a/locales/es.po +++ b/locales/es.po @@ -30,6 +30,10 @@ msgstr "" msgid "What's Included?" msgstr "¿Qué está incluido?." +#: en.download.run_in_browser +msgid "Run in browser" +msgstr "Abrir en el navegador" + #: en.download.requirements.title msgid "Requirements" msgstr "Requisitos" diff --git a/source-common/images/browsers-logo.png b/source-common/images/browsers-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..3022b0e3ec341d7abb3fa486aee7d8070ebd41df GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEjKx9jP7LeL$-D%z#XVgdLn2z= z-Z1oHb`)uNsIM3+lGC)bnwk6USyq;6!97i`S>MH0HnV?VaB>mQ_O_nAB}w#1m~KtC zwo0JH#c=?)4%GJJ>I!B;cR@+74=kRy{DCd*R(AWsU1+|Dd4Zu5Je!dCVl46^ShW~6p~O#p@$gQu&X%Q~loCIDkolP~}P literal 0 HcmV?d00001 diff --git a/source/localizable/download.html.erb b/source/localizable/download.html.erb index d91af3a..2f8e427 100755 --- a/source/localizable/download.html.erb +++ b/source/localizable/download.html.erb @@ -42,7 +42,11 @@ keywords: xampp, apache, php, perl, mysql, windows, linux, osx - <%= download_link_to "#{t('Download')} (#{bits[1..-1]} bit)", download["url"], :class => "button" %> + <% if download["browser_app"] == true %> + <%= link_to t('Run in browser'), download["url"], :class => "button", :target => "_blank" %> + <% else %> + <%= download_link_to "#{t('Download')} (#{bits[1..-1]} bit)", download["url"], :class => "button" %> + <% end %> <%= download["size"] %> <% end %> diff --git a/source/localizable/index.html.erb b/source/localizable/index.html.erb index 61183ca..d27aefc 100644 --- a/source/localizable/index.html.erb +++ b/source/localizable/index.html.erb @@ -36,7 +36,7 @@ keywords: xampp, apache, php, perl, mysql, open source distribution <% downloads.each do |os, downloads| %> - <% if os != 'appleVM' %> + <% if os != 'appleVM' && os != 'browsers' %>
<% last_main_version = downloads.last From 974c66678b8933e53725d12d65732244e230f18b Mon Sep 17 00:00:00 2001 From: Angel M Miguel Date: Thu, 7 Nov 2024 13:04:01 +0100 Subject: [PATCH 2/3] Update browsers requirements --- downloads.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/downloads.yml b/downloads.yml index 36fc9e6..1a95257 100644 --- a/downloads.yml +++ b/downloads.yml @@ -159,7 +159,7 @@ browsers: php_version: 8.3.12 whats_included: Alpine Linux 3.20, Apache 2.4.62, MariaDB 10.11-8, PHP 8.3.12 & PEAR + multibyte (mbstring) support, Perl 5.38.2, phpMyAdmin 5.2.1 - requirements: 'Firefox, Safari, or any Chromium based browser like Google Chrome or Bing. The mobile versions for Apple iOS are not supported yet.' + requirements: 'Tested on Desktop versions of Chrome and derivatives' downloads: x64: checksum_md5: Not required From ce6acd9db6b6f6e60df52130b6a0bc6815072512 Mon Sep 17 00:00:00 2001 From: Angel M Miguel Date: Thu, 7 Nov 2024 13:13:45 +0100 Subject: [PATCH 3/3] Update wording --- en.po | 4 ++-- locales/en.po | 4 ++-- locales/es.po | 2 +- source/localizable/download.html.erb | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/en.po b/en.po index ed9b804..bbafb7a 100755 --- a/en.po +++ b/en.po @@ -25,8 +25,8 @@ msgstr "" msgid "What's Included?" msgstr "" #: en.download.run_in_browser -msgid "Run in browser" -msgstr "Lanzar en el navegador" +msgid "Run in the browser" +msgstr "Run in the browser" #: en.download.requirements.title msgid "Requirements" msgstr "" diff --git a/locales/en.po b/locales/en.po index 1c1b951..e957ee8 100755 --- a/locales/en.po +++ b/locales/en.po @@ -31,8 +31,8 @@ msgid "What's Included?" msgstr "What's Included?" #: en.download.run_in_browser -msgid "Run in browser" -msgstr "Run in browser" +msgid "Run in the browser" +msgstr "Run in the browser" #: en.download.requirements.title msgid "Requirements" diff --git a/locales/es.po b/locales/es.po index 329baec..9e40e0d 100755 --- a/locales/es.po +++ b/locales/es.po @@ -31,7 +31,7 @@ msgid "What's Included?" msgstr "¿Qué está incluido?." #: en.download.run_in_browser -msgid "Run in browser" +msgid "Run in the browser" msgstr "Abrir en el navegador" #: en.download.requirements.title diff --git a/source/localizable/download.html.erb b/source/localizable/download.html.erb index 2f8e427..32b4fdb 100755 --- a/source/localizable/download.html.erb +++ b/source/localizable/download.html.erb @@ -43,7 +43,7 @@ keywords: xampp, apache, php, perl, mysql, windows, linux, osx <% if download["browser_app"] == true %> - <%= link_to t('Run in browser'), download["url"], :class => "button", :target => "_blank" %> + <%= link_to t('Run in the browser'), download["url"], :class => "button", :target => "_blank" %> <% else %> <%= download_link_to "#{t('Download')} (#{bits[1..-1]} bit)", download["url"], :class => "button" %> <% end %>