prepare for localization following Hugo standards #29
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eighthave
force-pushed
the
prepare-for-localization
branch
2 times, most recently
from
fa1b0b5
to
f0e73d1
Compare
eighthave
force-pushed
the
prepare-for-localization
branch
from
f0e73d1
to
258bb80
Compare
mxmehl
reviewed
Jul 23, 2020
|
Thanks a bunch! With the commented config I was able to build it. All subsites looks as expected, but one problem on the index: --- /tmp/index_old.html 2020-07-23 17:15:26.573371833 +0200
+++ /tmp/index_new.html 2020-07-23 17:13:34.623440806 +0200
@@ -81,24 +81,21 @@
<div class="content-section-b">
<div class="container page-index">
-
<div class="clearfix"></div>
<h1 class="title"><strong>REUSE</strong> SOFTWARE</h1>
-
<p class="lead intro">
We make licensing easy for humans and machines alike. We solve a
fundamental issue that Free Software licensing has at the very source:
what license is a file licensed under, and who owns the copyright?
<strong>Adopting our recommendations is as easy as one-two-three</strong>!
</p>
-
-
+<!-- STEPS -->
<div class="row vertical-align">
<div class="reuse-logo col-md-4">
<img src="/img/reuse.png" alt="Logo of REUSE" />
</div>
<div class="col-md-8">
-
+ <!-- Step 1 -->
<div class="reuse-step row">
<div class="reuse-step-no col-md-1 col-md-offset-0">
<span style="color:orangered;">1.</span>
@@ -107,7 +104,7 @@
<p>Choose and provide licenses</p>
</div>
</div>
-
+ <!-- Step 2 -->
<div class="reuse-step row">
<div class="reuse-step-no col-md-1 col-md-offset-1">
<span style="color:orange;">2.</span>
@@ -116,7 +113,7 @@
<p>Add copyright and licensing information to each file</p>
</div>
</div>
-
+ <!-- Step 3 -->
<div class="reuse-step row">
<div class="reuse-step-no col-md-1 col-md-offset-2">
<span style="color:green;">3.</span>
@@ -127,9 +124,7 @@
</div>
</div>
</div>
-
<hr class="intro-divider">
-
<div class="intro-message">
<center>
<video controls="controls" poster="/img/poster.jpg" crossorigin="crossorigin">
@@ -137,15 +132,13 @@
<source src="https://download.fsfe.org/videos/reuse/reuse_software_en_desktop.webm" type='video/webm; codecs="vp9, opus"' media="screen and (min-device-width:1000px)" />
<source src="https://download.fsfe.org/videos/reuse/reuse_software_en_mobile.mp4" type='video/mp4; codecs="avc1.42E01E, mp4a.40.2"' media="screen and (max-device-width:999px)" />
<source src="https://download.fsfe.org/videos/reuse/reuse_software_en_mobile.webm" type='video/webm; codecs="vp9, opus"' media="screen and (max-device-width:999px)" />
-
- <track src="https://download.fsfe.org/videos/reuse/subtitles/webvtt/reuse_en.vtt" kind="subtitles" srclang="en" label="English">
- </video>
+<pre><code> <track src="https://download.fsfe.org/videos/reuse/subtitles/webvtt/reuse_en.vtt" kind="subtitles" srclang="en" label="English">
+</video>
+</code></pre>
</center>
</div>
-
<p>Copyright and licensing is difficult, especially when reusing software from different projects that are released under various different licenses. REUSE was started by the <a href="https://fsfe.org">Free Software Foundation Europe</a> (FSFE) to provide a set of recommendations to make licensing your Free Software projects easier. Not only do these recommendations make it easier for you to declare the licenses under which your works are released, but they also make it easier for a computer to understand how your project is licensed.</p>
-
-
+<!-- Developers -->
<div class="reuse-tops row vertical-align">
<div class="icon col-sm-2"><i class="fas fa-code"></i></div>
<div class="col-sm-10">
@@ -153,7 +146,7 @@
<p>The license of your project sets the terms under which others can reuse your software. That is why you should make sure that it is clear for everyone which parts of your software are under which license. REUSE safeguards your intentions and assists you in this process. Have a look at our <a href="/dev">tools section</a> to learn about the tool, inclusion in CI/CD processes, and more.</p>
</div>
</div>
-
+<!-- Reusers -->
<div class="reuse-tops row vertical-align">
<div class="icon col-sm-2"><i class="fas fa-redo"></i></div>
<div class="col-sm-10">
@@ -161,7 +154,7 @@
<p>Free Software enables you to build on top of the work of others and therefore innovate quickly. But the more external components you use, the harder it is to keep an overview of copyright holders and their licensing choices. With REUSE, each file holds the necessary information, and your repo transparently contains all used licenses.</p>
</div>
</div>
-
+<!-- Legal experts -->
<div class="reuse-tops row vertical-align">
<div class="icon col-sm-2"><i class="fas fa-balance-scale"></i></div>
<div class="col-sm-10">The comments are as you said and no problem, but look at the |
|
It looks like hugo is getting confused by the HTML, since the file is actually diff --git a/site/content/_index.md b/site/content/_index.md
index 05fb29c..f7f2f4b 100644
--- a/site/content/_index.md
+++ b/site/content/_index.md
@@ -59,7 +59,7 @@
<source src="https://download.fsfe.org/videos/reuse/reuse_software_en_mobile.mp4" type='video/mp4; codecs="avc1.42E01E, mp4a.40.2"' media="screen and (max-device-width:999px)" />
<source src="https://download.fsfe.org/videos/reuse/reuse_software_en_mobile.webm" type='video/webm; codecs="vp9, opus"' media="screen and (max-device-width:999px)" />
- <track src="https://download.fsfe.org/videos/reuse/subtitles/webvtt/reuse_en.vtt" kind="subtitles" srclang="en" label="English">
+<track src="https://download.fsfe.org/videos/reuse/subtitles/webvtt/reuse_en.vtt" kind="subtitles" srclang="en" label="English">
</video>
</center>
</div>
|
eighthave
force-pushed
the
prepare-for-localization
branch
from
258bb80
to
055aff2
Compare
|
Changing the file from |
|
Excellent, thanks! LGTM and will merge |
eighthave
added a commit
to eighthave/reuse-website
that referenced
this pull request
Aug 19, 2020
mxmehl
pushed a commit
that referenced
this pull request
Oct 23, 2020
mxmehl
pushed a commit
that referenced
this pull request
Oct 23, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The moves the index contents into the content/ subdir, following the Hugo standard practice. That will make that page localizable. Then this also moves "chrome" strings into the standard Hugo i18n layout, with the strings for each language in a "data" file.
The only differences in the site are: