Merge pull request #1877 from dscho/fix-book-repository-URLs

ttaylorr · web-flow · commit 55ec5d0edf7f · 2024-09-26T10:15:32.000-05:00
Fix book repository URLs
diff --git a/external/book/data/book/az.yml b/external/book/data/book/az.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: az
+repository_url: https://github.com/progit2-aze/progit2
 chapters:
 - cs_number: '1'
   title: Başlanğıc
diff --git a/external/book/data/book/be.yml b/external/book/data/book/be.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: be
+repository_url: https://github.com/progit/progit2-be
 chapters:
 - cs_number: '1'
   title: Першыя крокі
diff --git a/external/book/data/book/bg.yml b/external/book/data/book/bg.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: bg
+repository_url: https://github.com/progit/progit2-bg
 chapters:
 - cs_number: '1'
   title: Начало
diff --git a/external/book/data/book/cs.yml b/external/book/data/book/cs.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: cs
+repository_url: https://github.com/progit-cs/progit2-cs
 chapters:
 - cs_number: '1'
   title: Úvod
diff --git a/external/book/data/book/de.yml b/external/book/data/book/de.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: de
+repository_url: https://github.com/progit/progit2-de
 chapters:
 - cs_number: '1'
   title: Erste Schritte
diff --git a/external/book/data/book/en.yml b/external/book/data/book/en.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: en
+repository_url: https://github.com/progit/progit2
 chapters:
 - cs_number: '1'
   title: Getting Started
diff --git a/external/book/data/book/es.yml b/external/book/data/book/es.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: es
+repository_url: https://github.com/progit/progit2-es
 chapters:
 - cs_number: '1'
   title: Inicio - Sobre el Control de Versiones
diff --git a/external/book/data/book/fa.yml b/external/book/data/book/fa.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: fa
+repository_url: https://github.com/progit2-fa/progit2
 chapters:
 - cs_number: '1'
   title: شروع به کار
diff --git a/external/book/data/book/fr.yml b/external/book/data/book/fr.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: fr
+repository_url: https://github.com/progit/progit2-fr
 chapters:
 - cs_number: '1'
   title: Démarrage rapide
diff --git a/external/book/data/book/gr.yml b/external/book/data/book/gr.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: gr
+repository_url: https://github.com/progit2-gr/progit2
 chapters:
 - cs_number: '1'
   title: Ξεκινώντας με το Git
diff --git a/external/book/data/book/id.yml b/external/book/data/book/id.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: id
+repository_url: https://github.com/progit/progit2-id
 chapters:
 - cs_number: '1'
   title: Memulai
diff --git a/external/book/data/book/it.yml b/external/book/data/book/it.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: it
+repository_url: https://github.com/progit/progit2-it
 chapters:
 - cs_number: '1'
   title: Per Iniziare
diff --git a/external/book/data/book/ja.yml b/external/book/data/book/ja.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: ja
+repository_url: https://github.com/progit/progit2-ja
 chapters:
 - cs_number: '1'
   title: 使い始める
diff --git a/external/book/data/book/ko.yml b/external/book/data/book/ko.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: ko
+repository_url: https://github.com/progit/progit2-ko
 chapters:
 - cs_number: '1'
   title: 시작하기
diff --git a/external/book/data/book/mk.yml b/external/book/data/book/mk.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: mk
+repository_url: https://github.com/progit2-mk/progit2
 chapters:
 - cs_number: '1'
   title: Почеток
diff --git a/external/book/data/book/ms.yml b/external/book/data/book/ms.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: ms
+repository_url: https://github.com/progit2-ms/progit2
 chapters:
 - cs_number: '1'
   title: Getting Started
diff --git a/external/book/data/book/nl.yml b/external/book/data/book/nl.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: nl
+repository_url: https://github.com/progit/progit2-nl
 chapters:
 - cs_number: '1'
   title: Aan de slag
diff --git a/external/book/data/book/pl.yml b/external/book/data/book/pl.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: pl
+repository_url: https://github.com/progit2-pl/progit2-pl
 chapters:
 - cs_number: '1'
   title: Pierwsze kroki
diff --git a/external/book/data/book/pt-br.yml b/external/book/data/book/pt-br.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: pt-br
+repository_url: https://github.com/progit/progit2-pt-br
 chapters:
 - cs_number: '1'
   title: Começando
diff --git a/external/book/data/book/pt-pt.yml b/external/book/data/book/pt-pt.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: pt-pt
+repository_url: https://github.com/progit2-pt-pt/progit2
 chapters:
 - cs_number: '1'
   title: Começando
diff --git a/external/book/data/book/ru.yml b/external/book/data/book/ru.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: ru
+repository_url: https://github.com/progit/progit2-ru
 chapters:
 - cs_number: '1'
   title: Введение
diff --git a/external/book/data/book/sl.yml b/external/book/data/book/sl.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: sl
+repository_url: https://github.com/progit/progit2-sl
 chapters:
 - cs_number: '1'
   title: Začetek
diff --git a/external/book/data/book/sr.yml b/external/book/data/book/sr.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: sr
+repository_url: https://github.com/progit/progit2-sr
 chapters:
 - cs_number: '1'
   title: Почетак
diff --git a/external/book/data/book/sv.yml b/external/book/data/book/sv.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: sv
+repository_url: https://github.com/progit2-sv/progit2
 chapters:
 - cs_number: '1'
   title: Kom igång
diff --git a/external/book/data/book/tl.yml b/external/book/data/book/tl.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: tl
+repository_url: https://github.com/progit2-tl/progit2
 chapters:
 - cs_number: '1'
   title: Pagsisimula
diff --git a/external/book/data/book/tr.yml b/external/book/data/book/tr.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: tr
+repository_url: https://github.com/progit/progit2-tr
 chapters:
 - cs_number: '1'
   title: Başlangıç
diff --git a/external/book/data/book/uk.yml b/external/book/data/book/uk.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: uk
+repository_url: https://github.com/progit/progit2-uk
 chapters:
 - cs_number: '1'
   title: Вступ
diff --git a/external/book/data/book/uz.yml b/external/book/data/book/uz.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: uz
+repository_url: https://github.com/progit/progit2-uz
 chapters:
 - cs_number: '1'
   title: Иш бошланиши
diff --git a/external/book/data/book/zh-tw.yml b/external/book/data/book/zh-tw.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: zh-tw
+repository_url: https://github.com/progit/progit2-zh-tw
 chapters:
 - cs_number: '1'
   title: 開始
diff --git a/external/book/data/book/zh.yml b/external/book/data/book/zh.yml
@@ -1,6 +1,7 @@
 ### DO NOT EDIT! Generated by script/update-book2.rb
 ---
 language_code: zh
+repository_url: https://github.com/progit/progit2-zh
 chapters:
 - cs_number: '1'
   title: 起步
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
@@ -7,7 +7,7 @@
         <a href="{{ relURL "about" }}"{{ if (eq $section "about") }} class="active"{{ end }}>About</a>
         <ul{{ if (eq $section "about") }} class="expanded"{{ end }}>
           {{ if (eq $section "about") }}
-	  {{ $subsection := .Params.subsection }}
+          {{ $subsection := .Params.subsection }}
           {{ $abouts := sort (where .Site.RegularPages "Params.section" "about") "Params.order"  }}
           {{ range $i, $about := $abouts }}
             <li>
@@ -51,7 +51,7 @@
     </ul>
     {{ if (eq .Params.Sidebar "book") }}
       <hr class="sidebar">
-      {{ partial "translations.html" }}
+      {{ partial "translations.html" . }}
     {{ else if (and (ne $section "documentation") (ne $section "site")) }}
       <hr class="sidebar">
       {{ partial "book.html" }}
diff --git a/layouts/partials/translations.html b/layouts/partials/translations.html
@@ -48,6 +48,6 @@
 </p>
 <hr class="sidebar"/>
 <p>
-The source of this book is <a href="{{ .Page.book.repository_url }}">hosted on GitHub.</a></br>
+The source of this book is <a href="{{ (index (index .Site.Data.book .Page.Params.book.language_code) "repository_url") }}">hosted on GitHub.</a></br>
 Patches, suggestions and comments are welcome.
 </p>
diff --git a/script/book.rb b/script/book.rb
@@ -118,6 +118,7 @@ def save
     end
     data = {
       "language_code" => @language_code,
+      "repository_url" => "https://github.com/#{@@all_books[@language_code]}",
       "chapters" => chapters
     }
     path = File.join(File.dirname(__FILE__), "..", "external", "book", "data", "book", "#{@language_code}.yml")
diff --git a/tests/git-scm.spec.js b/tests/git-scm.spec.js
@@ -205,10 +205,18 @@ test('book', async ({ page }) => {
   await page.goto(`${url}book`)
   await expect(page).toHaveURL(`${url}book/en/v2`)
 
+  // the repository URL is correct
+  await expect(page.getByRole('link', { name: 'hosted on GitHub' }))
+    .toHaveAttribute('href', 'https://github.com/progit/progit2')
+
   // Navigate to the first section
   await page.getByRole('link', { name: 'Getting Started' }).click()
   await expect(page).toHaveURL(/Getting-Started-About-Version-Control/)
 
+  // the repository URL is still correct
+  await expect(page.getByRole('link', { name: 'hosted on GitHub' }))
+    .toHaveAttribute('href', 'https://github.com/progit/progit2')
+
   // Verify that the drop-down is shown when clicked
   const chaptersDropdown = page.locator('#chapters-dropdown')
   await expect(chaptersDropdown).toBeHidden()
@@ -224,6 +232,10 @@ test('book', async ({ page }) => {
   await expect(page).toHaveURL(/book\/fr/)
   await expect(page.getByRole('link', { name: 'Démarrage rapide' })).toBeVisible()
 
+  // the repository URL now points to the French translation
+  await expect(page.getByRole('link', { name: 'hosted on GitHub' }))
+    .toHaveAttribute('href', 'https://github.com/progit/progit2-fr')
+
   // Navigate to a page whose URL contains a question mark
   await page.goto(`${url}book/az/v2/Başlanğıc-Git-Nədir?`)
   if (isRailsApp) {
@@ -233,6 +245,10 @@ test('book', async ({ page }) => {
     await expect(page).toHaveURL(/Ba%C5%9Flan%C4%9F%C4%B1c-Git-N%C9%99dir%3F/)
   }
   await expect(page.getByRole('document')).toHaveText(/Snapshot’lar, Fərqlər Yox/)
+
+  // the repository URL now points to the Azerbaijani translation
+  await expect(page.getByRole('link', { name: 'hosted on GitHub' }))
+    .toHaveAttribute('href', 'https://github.com/progit2-aze/progit2')
 })
 
 test('404', async ({ page }) => {
