Merge pull request #3050 from cncf/main

[ja] Merge `main` into `dev-ja` to sync-up

Author: seokho-son

.gitignore

@@ -4,6 +4,7 @@ resources/
 node_modules/
 .hugo_build.lock
 .DS_Store
+pagefind
 
 # Local Netlify folder
 .netlify

Makefile

@@ -0,0 +1,28 @@
+serve:
+	hugo server \
+		--disableFastRender \
+		--buildDrafts \
+		--buildFuture \
+		--ignoreCache
+		--printI18nWarnings \
+		--printMemoryUsage \
+		--printPathWarnings \
+		--printUnusedTemplates \
+		--templateMetrics \
+		--templateMetricsHints \
+		--gc
+
+production-build:
+	git submodule update --init --recursive
+	hugo \
+		--minify
+	npx -y pagefind --site public
+
+preview-build:
+	git submodule update --init --recursive
+	hugo \
+		--baseURL $(DEPLOY_PRIME_URL) \
+		--buildDrafts \
+		--buildFuture \
+		--minify
+	npx -y pagefind --site public

README.md

@@ -50,6 +50,6 @@ git submodule update --init --recursive
 npm install
 ```
 
-You can then run the site using `npm run serve` (select "[Hugo]").
+You can then run the site using `npm run serve` (select "[Hugo]"). To have the site run locally with a functioning local search, run `npm run serve:with-pagefind`.
 
 [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?repo=cncf/glossary)

assets/js/search.js

@@ -0,0 +1,43 @@
+/*
+Copyright 2018 Google LLC
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+(function($) {
+
+    'use strict';
+
+    var Search = {
+        init: function() {
+            $(document).ready(function() {
+               $(document).on('keypress', '.td-search-input', function(e) {
+                    if (e.keyCode !== 13) {
+                        return
+                    }
+
+                    var query = $(this).val();
+                    var searchPage = $(this).data('search-page') + "?q=" + query;
+                    document.location = searchPage;
+
+                    return false;
+                });
+
+            });
+        },
+    };
+
+    Search.init();
+
+
+}(jQuery));

assets/scss/_search.scss

@@ -100,3 +100,14 @@
 	}
 
 }
+
+.pagefind-ui__result-link {
+	color: $link-color !important;
+}
+.pagefind-ui__search-clear {
+	padding-left: 20px !important;
+	padding-right: 20px !important;
+}
+#search {
+	margin-top: 40px;
+}

config.toml

@@ -132,43 +132,51 @@ weight = 9
 [languages.pt-br.params]
 description = "O Projeto CNCF Glossário Cloud Native se destina a ser usado como uma referência para termos comuns usados ao falar sobre aplicações nativas de nuvem."
 
+[languages.ru]
+contentDir = "content/ru"
+languageName = "Русский (Russian)"
+title = "Глоссарий Cloud Native"
+weight = 10
+[languages.ru.params]
+description = "Глоссарий Cloud Native — справочник по общим терминам, имеющим отношение к нативным облачным приложениям и технологиям. Разрабатывается фондом CNCF."
+
 [languages.zh-cn]
 contentDir = "content/zh-cn"
 languageName = "简体中文 (Simplified Chinese)"
 title = "Cloud Native(云原生) Glossary"
-weight = 10
+weight = 11
 [languages.zh-cn.params]
 description = "CNCF 云原生 Glossary 项目旨在用作讨论云原生应用程序时常用术语的参考"
 
 [languages.es]
 contentDir = "content/es"
 languageName = "Español (Spanish)"
 title = "Cloud Native Glosario"
-weight = 11
+weight = 12
 [languages.es.params]
 description = "El proyecto de CNCF Cloud Native Glosario pretende ser usado como una referencia para los terminos comunes usados cuando se habla acerca de las aplicaciones nativas para la nube."
 
 [languages.zh-tw]
 contentDir = "content/zh-tw"
 languageName = "繁體中文 (Traditional Chinese)"
 title = "Cloud Native(雲端原生) Glossary"
-weight = 12
+weight = 13
 [languages.zh-tw.params]
 description = "CNCF 雲端原生 Glossary 專案旨在用作討論雲端原生應用程式時常用術語的參考"
 
 [languages.tr]
 title = "Cloud Native Sözlüğü"
 languageName ="Türkçe (Turkish)"
 contentDir = "content/tr"
-weight = 13
+weight = 14
 [languages.tr.params]
 description = "CNCF Cloud Native Sözlüğü projesi, cloud native uygulamalardan bahsederken kullanılan yaygın terimler için bir referans olarak kullanılmak üzere tasarlanmıştır."
 
 [languages.ur]
 contentDir = "content/ur"
 languageName = "اردو (Urdu)"
 title = "کلاؤڈ کی مقامی لغت"
-weight = 14
+weight = 15
 [languages.ur.params]
 description = "CNCF کلاؤڈ کی مقامی لغت کا مقصد کلاؤڈ مقامی ایپلی کیشنز کے بارے میں بات کرتے وقت استعمال ہونے والی عام اصطلاحات کے حوالے کے طور پر استعمال کرنا ہے۔"
 
@@ -226,7 +234,7 @@ github_repo = "https://github.com/cncf/glossary"
 github_branch = "main"
 
 # Google Custom Search Engine ID. Remove or comment out to disable search.
-gcs_engine_id = "eda0239a7d3fd0d90"
+# gcs_engine_id = "eda0239a7d3fd0d90"
 
 # Enable Algolia DocSearch
 algolia_docsearch = false

content/de/search.md

@@ -0,0 +1,4 @@
+---
+title: Search Results
+layout: search
+---

content/en/application-programming-interface.md

@@ -21,4 +21,4 @@ Without a shared framework, it is challenging for applications to [scale](/scala
 
 APIs allow computer programs or applications to interact and share information in a defined and understandable manner. 
 They are the building blocks for modern applications and they provide developers with a way to integrate applications together. 
-Whenever you hear about [microservices](/microservices/) working together, you can infer that they interact via an API. 
+Whenever you hear about [microservices](/microservices-architecture/) working together, you can infer that they interact via an API. 

content/en/chaos-engineering.md

@@ -15,7 +15,7 @@ techniques to increase product resiliency and [reliability](/reliability/).
 A system's ability to tolerate failures while ensuring adequate service quality is 
 typically a software development requirement. 
 There are several aspects involved that could lead to outages of an application, 
-like infrastructure, platform or other moving parts of a ([microservice](/microservices/)-based) application. 
+like infrastructure, platform or other moving parts of a ([microservice](/microservices-architecture/)-based) application. 
 High-frequency deployment of new features to the production environment can 
 result in a high probability of downtime and a critical incident 
 — with considerable consequences to the business.

content/en/devops.md

@@ -11,7 +11,7 @@ DevOps calls for groups of engineers that work on small components (versus an en
 
 ## Problem it addresses
 
-Traditionally, in complex organizations with [tightly-coupled](/tightly-coupled-architectures/) [monolithic apps](/monolithic-apps/), 
+Traditionally, in complex organizations with [tightly-coupled](/tightly-coupled-architecture/) [monolithic apps](/monolithic-apps/), 
 work was generally fragmented between multiple groups. 
 This led to numerous handoffs and long lead times. 
 Each time a component or update was ready, it was placed in a queue for the next team.