Test-out jekyll after doing huge merges of pt-BR and de-DE

pt-BR needed to have many pages updated due to renaming of images to use undelines instead of spaces, so there is a big gap in testing not done in the last few days. Time to check fixes, and good time to try jekyll. Have pt-BR pages more or less sync upto General_UI_Introduction now. Some updates to README.md concerning jekyll and (currently) Ubuntu 24.04. Noted that de-DE pages keep redirecting to English using jekyll, so need to first fix _config.yml de-DE/index.html, and other related files. Made additional fixes and alignments to all other index.html for consistency. Only a small number of de-DE pages are translated, therefore relatively quick to check links. Sync footer and header-masthead html files, get alignments to match. Sync bookpage and homepage html files, get alignments to match. Resolved issue concerning FreedomSponsor by using descriptions that can suggest more up-to-date sites. This makes it a less specific, but more resilient to sites disappearing as time goes on. Closes issue #229. Synced When_things_Go_Wrong, plus included upgrades to pages. ja-JP had excellent suggestions on highlighting books, therefore made similar changes across all equivalent language pages. Synced Further_Reading, plus included upgrades to pages.
fontforge · Jun 30, 2024 · 141a2a9 · 141a2a9
1 parent 0a0c753
commit 141a2a9
Show file tree

Hide file tree

Showing 66 changed files with 777 additions and 263 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ If you wish to contribute to this website, you are very welcome to! Here are a f
 
 2. Contribute a change directly, by forking it on GitHub and editing the plain text files, then send a pull request. (If that sounds unfamiliar, [learn how with GitHub’s excellent interactive introduction](https://help.github.com)).
 
-3. Discuss general topics on the [fontforge-devel email discussion list](http://fontforge.10959.n7.nabble.com/Developer-f3.html) 
+3. Discuss general topics on the [fontforge-devel email discussion list](https://sourceforge.net/p/fontforge/mailman/fontforge-users/) 
 
 ## License
 
@@ -31,9 +31,9 @@ If you’re not familiar with GitHub, they have [excellent help pages](https://h
 
 - `_layouts/*.html`: HTML template files
 - `_includes/*.html`: snippets of HTML that are included in pages and templates
-- `assets/`: CSS, JS and image files
+- `assets/`: CSS, JS and (some) image files
 - `_config.yml`: Configuration for Jekyll (ignore this file)
-- `en-US/`: the site’s contents, in US English
+- `en-US/`: the site’s contents, in US English (default)
 - `en-US/images/precompressed/`: Directory of the original, pre-compressed content images
 
 #### File Formats
@@ -79,19 +79,19 @@ Example:
 
 #### How to build the site
 
-For Linux, ensure that ruby-dev is installed on your system: e.g. for Ubuntu 14.04:
+For Linux, ensure that ruby-dev is installed on your system: e.g. for Ubuntu 24.04:
 
 ```bash
 sudo apt-get install ruby-dev
 ```    
 
-First install Jekyll, with `gem`:
+Next, install Jekyll:
 
 ```bash
-sudo gem install jekyll
+sudo install jekyll
 ```
 
-To see the site as it will appear after processing by Jekyll and review your edits live in a browser layout, run:
+To see the site as it will appear after processing by Jekyll and review your edits live in a browser layout, first enter into designforfontforge.com root directory where _config.yml is located, and then run:
 
 ```bash
 jekyll serve --watch

diff --git a/_config.yml b/_config.yml
@@ -29,18 +29,19 @@ exclude:
   - "package.json"
 url: http://designwithfontforge.com
 title: Design With FontForge
-title_zh-CN: FontForge 与字体设计
-title_zh-TW: FontForge 與字體設計
-title_fr-FR: Design avec FontForge
+title_de-DE: Entwerfen Sie mit FontForge
 title_fa-IR: طراحی با فونت‌فورج
+title_fr-FR: Design avec FontForge
 title_ja-JP: Design With FontForge
 title_pt-BR: Design com FontForge
-title_de-DE: Design With FontForge
+title_zh-CN: FontForge 与字体设计
+title_zh-TW: FontForge 與字體設計
 subtitle: A book about how to create new typefaces using FontForge
-subtitle_zh-CN: 介绍如何使用 FontForge 创造新字体的书
-subtitle_zh-TW: 介紹以 FontForge 製作新字型的書
-subtitle_fr-FR: Un livre sur la création de polices à l'aide de FontForge
+subtitle_de-DE: A book about how to create new typefaces using FontForge
 subtitle_fa-IR: کتابی درباره چگونگی ساخت یک تایپ‌فیس جدید با کمک فونت‌فورج
+subtitle_fr-FR: Un livre sur la création de polices à l'aide de FontForge
 subtitle_ja-JP: A book about how to create new typefaces using FontForge
 subtitle_pt-BR: Um livro sobre como criar novos tipos usando FontForge
-subtitle_de-DE: A book about how to create new typefaces using FontForge
+subtitle_zh-CN: 介绍如何使用 FontForge 创造新字体的书
+subtitle_zh-TW: 介紹以 FontForge 製作新字型的書
+
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,10 +1,8 @@
 <!-- FOOTER -->
 <footer>
-
-<div class="inner">
-  <p>Last updated {{ site.time | date_to_long_string }}. You are invited to <a href="https://github.com/fontforge/designwithfontforge.com">contribute</a> to and improve <a class="editthispage" href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages{{ page.url | replace: '.html', '.md' }}" target="_blank">this page</a>.</p>
-  <p>Copyright &copy; 2012 - 2024, The Design With FontForge <a href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages/AUTHORS.txt">Authors</a>.</p>
-  <p>‘<a href="//designwithfontforge.com"><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Design With FontForge</span></a>’ by <a xmlns:cc="http://creativecommons.org/ns#" href="http://designwithfontforge.com" property="cc:attributionName" rel="cc:attributionURL">the FontForge Community</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">CC BY-SA 3.0</a>.
-</div>
-
+  <div class="inner">
+    <p>Last updated {{ site.time | date_to_long_string }}. You are invited to <a href="https://github.com/fontforge/designwithfontforge.com">contribute</a> to and improve <a class="editthispage" href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages{{ page.url | replace: '.html', '.md' }}" target="_blank">this page</a>.</p>
+    <p>Copyright &copy; 2012 - 2024, The Design With FontForge <a href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages/AUTHORS.txt">Authors</a>.</p>
+    <p>‘<a href="//designwithfontforge.com"><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Design With FontForge</span></a>’ by <a xmlns:cc="http://creativecommons.org/ns#" href="http://designwithfontforge.com" property="cc:attributionName" rel="cc:attributionURL">the FontForge Community</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">CC BY-SA 3.0</a>.
+  </div>
 </footer>
diff --git a/_includes/footer_de-DE.html b/_includes/footer_de-DE.html
@@ -1,10 +1,8 @@
 <!-- FOOTER -->
 <footer>
-
-<div class="inner">
-  <p>Last updated {{ site.time | date_to_long_string }}. You are invited to <a href="https://github.com/fontforge/designwithfontforge.com">contribute</a> to and improve <a class="editthispage" href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages{{ page.url | replace: '.html', '.md' }}" target="_blank">this page</a>.</p>
-  <p>Copyright &copy; 2012 - 2024, The Design With FontForge <a href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages/AUTHORS.txt">Authors</a>.</p>
-  <p>‘<a href="//designwithfontforge.com"><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Design With FontForge</span></a>’ by <a xmlns:cc="http://creativecommons.org/ns#" href="http://designwithfontforge.com" property="cc:attributionName" rel="cc:attributionURL">the FontForge Community</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">CC BY-SA 3.0</a>.
-</div>
-
+  <div class="inner">
+    <p>Last updated {{ site.time | date_to_long_string }}. You are invited to <a href="https://github.com/fontforge/designwithfontforge.com">contribute</a> to and improve <a class="editthispage" href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages{{ page.url | replace: '.html', '.md' }}" target="_blank">this page</a>.</p>
+    <p>Copyright &copy; 2012 - 2024, <a href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages/AUTHORS.txt">Authors</a> of Entwerfen Sie mit FontForge.</p>
+    <p>‘<a href="//designwithfontforge.com"><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Design With FontForge</span></a>’ by <a xmlns:cc="http://creativecommons.org/ns#" href="http://designwithfontforge.com" property="cc:attributionName" rel="cc:attributionURL">the FontForge Community</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">CC BY-SA 3.0</a>.
+  </div>
 </footer>
diff --git a/_includes/footer_fa-IR.html b/_includes/footer_fa-IR.html
@@ -1,29 +1,25 @@
 <!-- FOOTER -->
 <footer>
-
-<div class="inner">
-  <p>
-    آخرین به‌روزرسانی
-    {{ site.time | date_to_long_string }}
-    .
-    شما را دعوت می‌کنیم به
-    <a href="https://github.com/fontforge/designwithfontforge.com">مشارکت</a>
-    در بهبود
-    <a class="editthispage" href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages{{ page.url | replace: '.html', '.md' }}" target="_blank">این صفحه</a>
-    .
-  </p>
-  <p>
-    حق‌نشر &copy; 2012 - 2024،
-    <a href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages/AUTHORS.txt">پدیدآورندگان</a>
-    طراحی با فونت‌فورج.
-  </p>
-  <p>
-    ‘<a href="//designwithfontforge.com"><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">طراحی با فونت‌فورج</span></a>’
-    اثری از
-    <a xmlns:cc="http://creativecommons.org/ns#" href="http://designwithfontforge.com" property="cc:attributionName" rel="cc:attributionURL">اجتماع فونت فونت‌فورج</a>
-    تحت پروانهٔ
-    <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">CC BY-SA 3.0</a>
-    منتشر شده است.
-</div>
-
+  <div class="inner">
+    <p>
+      آخرین به‌روزرسانی
+      {{ site.time | date_to_long_string }}.
+      شما را دعوت می‌کنیم به
+      <a href="https://github.com/fontforge/designwithfontforge.com">مشارکت</a>
+      در بهبود
+      <a class="editthispage" href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages{{ page.url | replace: '.html', '.md' }}" target="_blank">این صفحه</a>.
+    </p>
+    <p>
+      حق‌نشر &copy; 2012 - 2024،
+      <a href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages/AUTHORS.txt">پدیدآورندگان</a>
+      طراحی با فونت‌فورج.
+    </p>
+    <p>
+      ‘<a href="//designwithfontforge.com"><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">طراحی با فونت‌فورج</span></a>’
+      اثری از
+      <a xmlns:cc="http://creativecommons.org/ns#" href="http://designwithfontforge.com" property="cc:attributionName" rel="cc:attributionURL">اجتماع فونت فونت‌فورج</a>
+      تحت پروانهٔ
+      <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">CC BY-SA 3.0</a>
+      منتشر شده است.
+  </div>
 </footer>
diff --git a/_includes/footer_fr-FR.html b/_includes/footer_fr-FR.html
@@ -1,10 +1,8 @@
 <!-- FOOTER -->
 <footer>
-
-<div class="inner">
-  <p>Dernière mise à jour {{ site.time | date_to_long_string }}. Vous êtes invité à <a href="https://github.com/fontforge/designwithfontforge.com">contribuer</a> et à améliorer <a class="editthispage" href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages{{ page.url | replace: '.html', '.md' }}" target="_blank">cette page</a>.</p>
-  <p>Copyright &copy; 2012 - 2024, Les <a href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages/AUTHORS.txt">auteurs</a> de Design With FontForge.</p>
-  <p>‘<a href="//designwithfontforge.com"><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Design With FontForge</span></a>’ par <a xmlns:cc="http://creativecommons.org/ns#" href="http://designwithfontforge.com" property="cc:attributionName" rel="cc:attributionURL">la communauté FontForge </a> est sous license <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">CC BY-SA 3.0</a>.
-</div>
-
+  <div class="inner">
+    <p>Dernière mise à jour {{ site.time | date_to_long_string }}. Vous êtes invité à <a href="https://github.com/fontforge/designwithfontforge.com">contribuer</a> et à améliorer <a class="editthispage" href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages{{ page.url | replace: '.html', '.md' }}" target="_blank">cette page</a>.</p>
+    <p>Copyright &copy; 2012 - 2024, Les <a href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages/AUTHORS.txt">Auteurs</a> de Design With FontForge.</p>
+    <p>‘<a href="//designwithfontforge.com"><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Design With FontForge</span></a>’ par <a xmlns:cc="http://creativecommons.org/ns#" href="http://designwithfontforge.com" property="cc:attributionName" rel="cc:attributionURL">la communauté FontForge </a> est sous license <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">CC BY-SA 3.0</a>.
+  </div>
 </footer>
diff --git a/_includes/footer_ja-JP.html b/_includes/footer_ja-JP.html
@@ -1,10 +1,8 @@
 <!-- FOOTER -->
 <footer>
-
-<div class="inner">
-  <p>最終更新日 {{ site.time | date_to_long_string }}。<a href="https://github.com/fontforge/designwithfontforge.com">このサイト</a> や以下の <a class="editthispage" href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages{{ page.url | replace: '.html', '.md' }}" target="_blank">各ページ</a> の改善活動へのご協力をお願いします。</p>
-  <p>著作権／Copyright &copy; 2012 - 2024, The Design With FontForge <a href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages/AUTHORS.txt">著作者の方々</a>.</p>
-  <p>‘<a href="//designwithfontforge.com"><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Design With FontForge</span></a>’ by <a xmlns:cc="http://creativecommons.org/ns#" href="http://designwithfontforge.com" property="cc:attributionName" rel="cc:attributionURL">the FontForge Community</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">CC BY-SA 3.0</a>.
-</div>
-
+  <div class="inner">
+    <p>最終更新日 {{ site.time | date_to_long_string }}。<a href="https://github.com/fontforge/designwithfontforge.com">このサイト</a> や以下の <a class="editthispage" href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages{{ page.url | replace: '.html', '.md' }}" target="_blank">各ページ</a> の改善活動へのご協力をお願いします。</p>
+    <p>著作権／Copyright &copy; 2012 - 2024, The Design With FontForge <a href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages/AUTHORS.txt">著作者の方々</a>.</p>
+    <p>‘<a href="//designwithfontforge.com"><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Design With FontForge</span></a>’ by <a xmlns:cc="http://creativecommons.org/ns#" href="http://designwithfontforge.com" property="cc:attributionName" rel="cc:attributionURL">the FontForge Community</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">CC BY-SA 3.0</a>.
+  </div>
 </footer>
diff --git a/_includes/footer_pt-BR.html b/_includes/footer_pt-BR.html
@@ -1,10 +1,8 @@
 <!-- FOOTER -->
 <footer>
-
-<div class="inner">
-  <p>Última atualização em {{ site.time | date_to_long_string }}. Você está convidado a <a href="https://github.com/fontforge/designwithfontforge.com">contribuir</a> e melhorar <a class="editthispage" href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages{{ page.url | replace: '.html', '.md' }}" target="_blank">essa página</a>.</p>
-  <p>Copyright &copy; 2012 - 2024, Os <a href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages/AUTHORS.txt">Autores</a> do Design With FontForge.</p>
-  <p>‘<a href="//designwithfontforge.com"><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Design With FontForge</span></a>’ pela <a xmlns:cc="http://creativecommons.org/ns#" href="http://designwithfontforge.com" property="cc:attributionName" rel="cc:attributionURL">Comunidade FontForge</a> é licenciado sob <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.pt_BR">CC BY-SA 3.0</a>.
-</div>
-
+  <div class="inner">
+    <p>Última atualização em {{ site.time | date_to_long_string }}. Você está convidado a <a href="https://github.com/fontforge/designwithfontforge.com">contribuir</a> e melhorar <a class="editthispage" href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages{{ page.url | replace: '.html', '.md' }}" target="_blank">essa página</a>.</p>
+    <p>Copyright &copy; 2012 - 2024, Os <a href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages/AUTHORS.txt">Autores</a> do Design With FontForge.</p>
+    <p>‘<a href="//designwithfontforge.com"><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Design With FontForge</span></a>’ pela <a xmlns:cc="http://creativecommons.org/ns#" href="http://designwithfontforge.com" property="cc:attributionName" rel="cc:attributionURL">Comunidade FontForge</a> é licenciado sob <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.pt_BR">CC BY-SA 3.0</a>.
+  </div>
 </footer>
diff --git a/_includes/footer_zh-CN.html b/_includes/footer_zh-CN.html
@@ -1,11 +1,9 @@
 <!-- FOOTER -->
 <footer>
-
-<div class="inner">
-  <p>上次更新于{{ site.time | date_to_long_string }}。诚邀您作出贡献和改善<a class="editthispage" href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages{{ page.url | replace: '.html', '.md' }}" target="_blank">本页</a>，<a href="https://github.com/fontforge/designwithfontforge.com">学习如何做</a>。</p>
-  <p>Copyright &copy; 2012 - 2024, The Design With FontForge Authors. <a href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages/AUTHORS.txt">Learn more...</a></p>
-  <p><a xmlns:cc="http://creativecommons.org/ns#" href="http://designwithfontforge.com" property="cc:attributionName" rel="cc:attributionURL">FontForge社区</a>的“<a href="//designwithfontforge.com"><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">使用FontForge进行设计</span></a>”采用<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>许可证。</p>
-  <p><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a></p>
-</div>
-
+  <div class="inner">
+    <p>上次更新于{{ site.time | date_to_long_string }}。诚邀您作出贡献和改善<a class="editthispage" href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages{{ page.url | replace: '.html', '.md' }}" target="_blank">本页</a>，<a href="https://github.com/fontforge/designwithfontforge.com">学习如何做</a>。</p>
+    <p>Copyright &copy; 2012 - 2024, The Design With FontForge Authors. <a href="https://github.com/fontforge/designwithfontforge.com/blob/gh-pages/AUTHORS.txt">Learn more...</a></p>
+    <p><a xmlns:cc="http://creativecommons.org/ns#" href="http://designwithfontforge.com" property="cc:attributionName" rel="cc:attributionURL">FontForge社区</a>的“<a href="//designwithfontforge.com"><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">使用FontForge进行设计</span></a>”采用<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>许可证。</p>
+    <p><a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a></p>
+  </div>
 </footer>