Skip to content

Conversation

@marmarek
Copy link
Member

@marmarek marmarek commented Mar 4, 2021

This is the massive refactor of the main website repository done by @maiska (marmarek#5) but with clean git history. Plus a few fixups. The actual translation tools are not added here yet and the language switcher menu is disabled.
There should be no visual change in the output - I've checked this on a few pages of different types and it seems to be ok.
Merging this now would greatly ease the work on finishing actual translations integration, as we can avoid frequent merge/rebase and conflict resolution.

Thanks @maiska for this work!

@marmarek
Copy link
Member Author

marmarek commented Mar 5, 2021

PipelineRetry

@andrewdavidwong
Copy link
Member

It looks like some of the new code inconsistently uses spaces and tabs for indentation. ☹️

Since the existing codebase uses all spaces, no tabs should be introduced.

@andrewdavidwong
Copy link
Member

I'm seeing some small bugs:

  • < character on its own line at the start of the body text of each News post
  • Half of the links at the top of the Team page now have blue text
  • Scope of the "unsupported" link covers more text in alerts on the Download page

I don't have time to look through every page of the website, of course, but these are the ones I've noticed so far.

I'm also confused about the restructuring. For example, this large file is introduced: https://github.com/QubesOS/qubesos.github.io/blob/9c345c7faf97089415f612bc5e7a7198d4c8b3fb/_data/index.yml

But we still have doc.md. That seems like bad duplication. What happens when we add/remove/rename a document? Surely we don't want to be maintaining both now. Does index.yml somehow get auto-updated?

@marmarek
Copy link
Member Author

marmarek commented Mar 6, 2021

For example, this large file is introduced: https://github.com/QubesOS/qubesos.github.io/blob/9c345c7faf97089415f612bc5e7a7198d4c8b3fb/_data/index.yml

But we still have doc.md

I have not changed qubes-doc repo here at all, but I think the doc.md is not used here anymore. The matching PR for qubes-doc (marmarek/qubes-doc#3) removes the doc.md file. TBH, I'd prefer for this indeed be auto-generated, which I think your release-specific split does.

Scope of the "unsupported" link covers more text in alerts on the Download page

Same for "testing". I've noticed it too. Technically it's trivial to fix, but it will make translation harder, because it will split that sentence into two parts (one for link and one without). IMO linking from the whole sentence is a good compromise.

@marmarek
Copy link
Member Author

marmarek commented Mar 6, 2021

testdeploy

@qubesos-bot qubesos-bot temporarily deployed to qa March 6, 2021 11:30 Inactive
@andrewdavidwong
Copy link
Member

For example, this large file is introduced: https://github.com/QubesOS/qubesos.github.io/blob/9c345c7faf97089415f612bc5e7a7198d4c8b3fb/_data/index.yml

But we still have doc.md

I have not changed qubes-doc repo here at all, but I think the doc.md is not used here anymore. The matching PR for qubes-doc (marmarek/qubes-doc#3) removes the doc.md file. TBH, I'd prefer for this indeed be auto-generated, which I think your release-specific split does.

That would be fine too, as long as we're not trying to manually keep two or more files in sync.

Scope of the "unsupported" link covers more text in alerts on the Download page

Same for "testing". I've noticed it too. Technically it's trivial to fix, but it will make translation harder, because it will split that sentence into two parts (one for link and one without). IMO linking from the whole sentence is a good compromise.

Ok, that's fine then.

Maya and others added 5 commits March 7, 2021 22:00
HTML is hard for translators to handle (to not break markup tags).
Where easily possible html files to markdown. Otherwise, move
translatable strings to separate yaml files (in _data dir), then
use layouts and includes to combine them into original html files. In
many cases it clarifies separation between data na layout, which is good
even without the translation context.

This commit adds also language switcher (useless at this stage) and few
tags to frontmatter ('lang', 'ref') that will be used in subsequent
commits.

And additionally, the files that are changed substantially, have
whitespaces fixed.
And fix header to really work with langmenu disabled
- fix 'testing' text
- restore <hr> between releases
Keep it compatible with unchanged qubes-doc repo for now.
@marmarek marmarek force-pushed the translation-prepare branch from 9c345c7 to 5c57f7b Compare March 7, 2021 21:01
@marmarek
Copy link
Member Author

marmarek commented Mar 8, 2021

testdeploy

@qubesos-bot qubesos-bot temporarily deployed to qa March 8, 2021 01:02 Inactive
@marmarek
Copy link
Member Author

marmarek commented Mar 8, 2021

@andrewdavidwong I've fixed the issues per the above discussion.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants