Website merge requestshttps://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests2017-06-30T12:36:14Zhttps://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests/70I18n homepage2017-06-30T12:36:14Zusername-removed-25042I18n homepage**NOTE: I'm not sure if this should be merged for Launch.** I'd be happy to wait it out and merge it afterwards. Another alternative is to get all of these changes in `master` so that we can start setting up Weblate, but remove d1cfc5090...**NOTE: I'm not sure if this should be merged for Launch.** I'd be happy to wait it out and merge it afterwards. Another alternative is to get all of these changes in `master` so that we can start setting up Weblate, but remove d1cfc5090b633 so that it is not exposed via the UI.
**Surge links:**
* [English](https://i18n-homepage-fdroid-website-pserwylo.surge.sh/fdroid-website/)
* [French](https://i18n-homepage-fdroid-website-pserwylo.surge.sh/fdroid-website/fr/)
You can switch languages via the language chooser in the top right.
**Test Weblate setup:**
* [For translators](http://weblate.peter.serwylo.com/weblate/projects/fdroid/website/)
* [For admins](https://gitlab.com/fdroid/fdroid-website/issues/68) (need to be a team member on our GitLab project to view)
Feel free to experiment adding translations (Tools -> Add new translation), browsing/editing translations, etc.
**TODO, but not show stoppers:**
These require attention, but I don't think they are show stoppers for merging this:
* Weblate currently prefills JSON translations when creating new translation. Each new translation is full of English translations, and so looks like it is not at 0% as it should. I need to investigate this further.
* Although I've documented the usage of a Weblate [pre-commit hook to format strings.json correctly](https://gitlab.com/pserwylo/fdroid-website/blob/i18n-homepage/TRANSLATIONS.md), I haven't actually got it working yet. I'm confident it will though, because the script works when I run it locally, and I got it from the official Weblate docs.
**Future improvements:**
* Add apache configuration for automatically showing the correct language based on the browser headers.
* I have some WIP branches for translating most of the rest of the website (Documentation, News).launch-localizedhttps://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests/67new Translation page and updates2017-06-30T12:36:33Zusername-removed-24982new Translation page and updatesThere is a new page to help people get started with translating, and for translators to find each other. Then there are some updates to existing docs.There is a new page to help people get started with translating, and for translators to find each other. Then there are some updates to existing docs.launch-localizedhttps://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests/89Rename GPG signatures to PGP2017-07-02T23:08:54Zusername-removed-56552Rename GPG signatures to PGP> This is a MR in conjuntion with fdroid/jekyll-fdroid!15
Rename "GPG Signature" strings to "PGP Signature", as suggested by @eighthave on !83, since they are standard OpenPGP signatures. [Link to the comment](https://gitlab.com/fdroi...> This is a MR in conjuntion with fdroid/jekyll-fdroid!15
Rename "GPG Signature" strings to "PGP Signature", as suggested by @eighthave on !83, since they are standard OpenPGP signatures. [Link to the comment](https://gitlab.com/fdroid/fdroid-website/commit/fdcd604f6df7c203d2f26d69c51c539a0109ac57#note_33285348).https://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests/91Add Felix Edelmann to list of contributors2017-07-03T08:14:09Zusername-removed-124398Add Felix Edelmann to list of contributors@fxedel As you might have noticed,
the Jekyll site you pioneered is finally online: https://f-droid.org.
Thank you a lot for your work.@fxedel As you might have noticed,
the Jekyll site you pioneered is finally online: https://f-droid.org.
Thank you a lot for your work.username-removed-399867username-removed-399867https://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests/94Add post: How F-Droid is Bringing Apps to Cuba2017-07-03T17:38:04Zusername-removed-26331Add post: How F-Droid is Bringing Apps to Cubahttps://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests/93L10n docs update2017-07-03T17:45:31Zusername-removed-24982L10n docs updateThis is an overhaul of the docs based on the completed localization setup with Weblate.This is an overhaul of the docs based on the completed localization setup with Weblate.launch-localizedhttps://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests/95Basic 404 page.2017-07-04T20:41:18Zusername-removed-25042Basic 404 page.Happy to take suggestions on the wording for this page, but hope this is at least a good start.
Should work on Apache (due to the changes in `.htaccess` in this branch) and also on GitLab pages (which looks for a `404.html`). Not sure a...Happy to take suggestions on the wording for this page, but hope this is at least a good start.
Should work on Apache (due to the changes in `.htaccess` in this branch) and also on GitLab pages (which looks for a `404.html`). Not sure about surge. I guess we'll see when this builds.
Fixes #91.https://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests/96Improve links on package page.2017-07-05T10:53:32Zusername-removed-25042Improve links on package page.Don't show the full links, instead just show "Website", "Issue tracker"
etc and link to the relevant place.
Also replaced "For full details and additional technical information,
see this application's page on the F-Droid wiki." with...Don't show the full links, instead just show "Website", "Issue tracker"
etc and link to the relevant place.
Also replaced "For full details and additional technical information,
see this application's page on the F-Droid wiki." with "Technical info"
and linked it directly to the wiki.
**[Old version](http://fdroid.gitlab.io/fdroid-website/packages/info.guardianproject.browser/)** | **[New version](https://improve-links-fdroid-website-pserwylo.surge.sh/fdroid-website/packages/info.guardianproject.browser/)** (don't worry about the broken "GPL" link, this is due to metadaata in the GP repo.
https://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests/97Show output of "git describe" in fotter2017-07-10T02:11:31Zusername-removed-25042Show output of "git describe" in fotterIf you are on the latest (annotated or signed) tag, then it will just show the tag. Otherwise, it shows [most recent tagtag]-[commits ahead of this tag]-g[current-commit-hash]. It also links to the relevant gitlab page to display that ve...If you are on the latest (annotated or signed) tag, then it will just show the tag. Otherwise, it shows [most recent tagtag]-[commits ahead of this tag]-g[current-commit-hash]. It also links to the relevant gitlab page to display that versions source code.https://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests/100Instructions on how to maintain the forum2017-07-12T23:11:13Zusername-removed-124398Instructions on how to maintain the forumhttps://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests/101Don't install bundler/jekyll via gem.2017-07-13T08:32:02Zusername-removed-25042Don't install bundler/jekyll via gem.The CI script was calling `gem install jekyll bundler`, as per the home page of the Jekyll site. However that is not required. Not only is `bundler` available in Debian anyway, but `gem install jekyll` doesn't specify the version, and it...The CI script was calling `gem install jekyll bundler`, as per the home page of the Jekyll site. However that is not required. Not only is `bundler` available in Debian anyway, but `gem install jekyll` doesn't specify the version, and it will get overriden by our `bundle install --path=vendor` later on. This is where we install the exact version of jekyll and other dependencies which we require.https://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests/92Linkchecker and baseurl for posts2017-07-16T13:37:55Zusername-removed-24982Linkchecker and baseurl for postsThis makes `linkchecker` check ~50 packages pages that start with "a". There needs to be some checks there too.
This also implements @pserwylo's suggestion in !88 for putting `site.baseurl` in the old, imported posts.This makes `linkchecker` check ~50 packages pages that start with "a". There needs to be some checks there too.
This also implements @pserwylo's suggestion in !88 for putting `site.baseurl` in the old, imported posts.https://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests/99Add "artwork" repo as submodule and expose `/badge/*`.2017-07-17T15:21:32Zusername-removed-25042Add "artwork" repo as submodule and expose `/badge/*`.I'm currently tackling this by:
* Adding https://gitlab.com/fdroid/arwork as a submodule
* The submodule lives in the top level directory of the Jekyll source
* There is a `/badge` dir which symlinks to `/artwork/badge`
This means th...I'm currently tackling this by:
* Adding https://gitlab.com/fdroid/arwork as a submodule
* The submodule lives in the top level directory of the Jekyll source
* There is a `/badge` dir which symlinks to `/artwork/badge`
This means that:
* We end up with the entire `artowrk` repo in the website (does that really matter?)
* You (and CI) need to `git submodule init && git submodule update`
If the resulting webroot in this MR is too ugly (with the `/artwork` dir and the `/badge` symlink) then let me know. Another option would be to create a script in `_plugins/prepare-artwork.rb` which:
* Clones the artwork repo.
* Copies the `/badges` dir to the output directory after building the site.
Fixes #97.https://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests/103Merge weblate website2017-07-17T15:36:00Zusername-removed-24982Merge weblate websitelaunch-localizedhttps://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests/104Only add artowrk in the f-droid.org CI task.2017-07-18T19:24:37Zusername-removed-25042Only add artowrk in the f-droid.org CI task.It is not required for other builds, and as such just ends up
taking up space and download time.
Given there is now important stuff in the website which is not
covered by CI automatically any more, I've added a "Production"
pipeline ite...It is not required for other builds, and as such just ends up
taking up space and download time.
Given there is now important stuff in the website which is not
covered by CI automatically any more, I've added a "Production"
pipeline item to make it easier to discover the manually-runnable
"f-droid.org" pipeline job. The goal is to encourage release
taggers to run this task on master before tagging.https://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests/102Random small updates2017-07-18T19:25:03Zusername-removed-24982Random small updatesThis is a collection of random small updates that I did while working on things.This is a collection of random small updates that I did while working on things.launch-localizedhttps://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests/109QuickStartGuide: Add missing newline2017-07-30T17:55:20Zusername-removed-1498620QuickStartGuide: Add missing newlineSmall fix.Small fix.https://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests/105Localize homepage screenshot2017-08-01T08:43:04Zusername-removed-25042Localize homepage screenshot@eighthave: not sure if what I did with regards to `zh_Hant + zh_Hans -> zh` is valid or not.
![desktop-de](/uploads/32d3099168ad4b692f3507b3dd4385dc/desktop-de.png)
![desktop-en](/uploads/cd21784ad23c40019f0434363605f1e5/desktop-en.p...@eighthave: not sure if what I did with regards to `zh_Hant + zh_Hans -> zh` is valid or not.
![desktop-de](/uploads/32d3099168ad4b692f3507b3dd4385dc/desktop-de.png)
![desktop-en](/uploads/cd21784ad23c40019f0434363605f1e5/desktop-en.png)
![mobile-en](/uploads/7add215acdac423aee15f6002bfae2bd/mobile-en.png)
Fixes #79.launch-localizedhttps://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests/108Also deploy legacy /forums for f-droid.org builds.2017-08-01T08:57:05Zusername-removed-25042Also deploy legacy /forums for f-droid.org builds.Uses the same technique as used for the /badge directory,
only this also updates that process to stream the .tar.gz file
rather than downloading the .zip file to disk.
Also, only copy to the built site when we are finished with Jekyll,
...Uses the same technique as used for the /badge directory,
only this also updates that process to stream the .tar.gz file
rather than downloading the .zip file to disk.
Also, only copy to the built site when we are finished with Jekyll,
so that Jekyll doesn't need to waste time processing files which don't
need to be touched.https://staging.gitlab.com/fdroid/fdroid-website/-/merge_requests/112docs: deploying_the_website: fix typo: tgs -> tags2017-08-12T13:06:24Zusername-removed-151489docs: deploying_the_website: fix typo: tgs -> tags