Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI & ja & zh] Enable format check, and fixes for ja and zh #4631

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions content/ja/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
title: OpenTelemetry
description: >-
効果的な観測を可能にする、高品質でユビキタスかつポータブルなテレメトリー
developer_note:
blocks/coverコラム(以下で使用)は、ファイル名に "background" を含む画像ファイルを背景画像として使用します。
developer_note: blocks/coverコラム(以下で使用)は、ファイル名に "background" を含む画像ファイルを背景画像として使用します。
show_banner: true
default_lang_commit: 902043db
---
Expand Down
4 changes: 2 additions & 2 deletions content/ja/docs/what-is-opentelemetry.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ OpenTelemetryの主な目的は、あなたのアプリケーションやシス

OpenTelemetryは、2つの重要な原則に従いながら、オブザーバビリティの需要を満たしています。

1. あなたが生成したデータはあなたのものです。ベンダーのロックインはありません。
2. APIと規約は1セットだけ覚えれば良いです。
1. あなたが生成したデータはあなたのものです。ベンダーのロックインはありません。
2. APIと規約は1セットだけ覚えれば良いです。

この2つの原則を組み合わせることで、現代のコンピューティングの世界で必要とされる柔軟性をチームや組織に与えられます。

Expand Down
24 changes: 12 additions & 12 deletions content/zh/docs/demo/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ default_lang_commit: b7ee690154aacc8d6e43636af00743994fb6dc27

想要了解特定编程语言的工具是如何工作的?从这里开始:

| 语言 | 自动插桩 | 插桩库 | 手动插桩 |
| ---------- | ------------------- | -------------------- | ------------------------------------ |
| .NET | | [购物车服务](services/cart/) | [购物车服务](services/cart/) |
| C++ | | | [货币服务](services/currency/) |
| Go | | [会计服务](services/accounting/)、[结账服务](services/checkout/)、[产品目录服务](services/product-catalog/) | [结账服务](services/checkout/)、 [产品目录服务](services/product-catalog/) |
| Java | [广告服务](services/ad/) | | [广告服务](services/ad/) |
| JavaScript | | [前端](services/frontend/) | [前端](services/frontend/)、[支付服务](services/payment/) |
| Kotlin | | [欺诈检测服务](services/fraud-detection/) | |
| PHP | | [报价服务](services/quote/) | [报价服务](services/quote/) |
| Python | [推荐服务](services/recommendation/) | | [推荐服务](services/recommendation/) |
| Ruby | | [电子邮件服务](services/email/) | [电子邮件服务](services/email/) |
| Rust | | [发货服务](services/shipping/) | [发货服务](services/shipping/) |
| 语言 | 自动插桩 | 插桩库 | 手动插桩 |
| ---------- | ------------------------------------ | ----------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------- |
| .NET | | [购物车服务](services/cart/) | [购物车服务](services/cart/) |
| C++ | | | [货币服务](services/currency/) |
| Go | | [会计服务](services/accounting/)、[结账服务](services/checkout/)、[产品目录服务](services/product-catalog/) | [结账服务](services/checkout/)、 [产品目录服务](services/product-catalog/) |
| Java | [广告服务](services/ad/) | | [广告服务](services/ad/) |
| JavaScript | | [前端](services/frontend/) | [前端](services/frontend/)、[支付服务](services/payment/) |
| Kotlin | | [欺诈检测服务](services/fraud-detection/) | |
| PHP | | [报价服务](services/quote/) | [报价服务](services/quote/) |
| Python | [推荐服务](services/recommendation/) | | [推荐服务](services/recommendation/) |
| Ruby | | [电子邮件服务](services/email/) | [电子邮件服务](services/email/) |
| Rust | | [发货服务](services/shipping/) | [发货服务](services/shipping/) |

## 服务文档

Expand Down
8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"spelling": "cSpell:ignore docsy elemetry HTMLTEST hugo loglevel netlify prebuild precheck preinstall postbuild postget refcache textlint -",
"spelling": "cSpell:ignore docsy elemetry HTMLTEST hugo loglevel netlify nowrap prebuild precheck preinstall postbuild postget refcache textlint -",
"Notes": [
"The 'all' runs _all_ named scripts in sequence, even if one fails; and exits with failure in that case."
],
"scripts": {
"__check:links": "make --keep-going check-links",
"_build": "npm run _hugo -- -e dev --buildDrafts --baseURL \"${DEPLOY_PRIME_URL:-http://localhost}\"",
"_check:format:any": "npx prettier --check --ignore-path ''",
"_check:format:ja+zh": "npm run _check:format:nowrap -- content/ja content/zh",
"_check:format:nowrap": "npm run _check:format:any -- --prose-wrap preserve",
"_check:format": "npx prettier --check .",
"_check:links--md": "npx markdown-link-check --config .markdown-link-check.json *.md",
"_check:links--warn": "npm run _check:links || (echo; echo 'WARNING: see link-checker output for issues.'; echo)",
Expand Down Expand Up @@ -38,7 +40,7 @@
"build": "npm run _build",
"cd:public": "cd public &&",
"check:filenames": "test -z \"$(npm run -s _ls-bad-filenames)\" || npm run -s _filename-error",
"check:format": "npm run _check:format || (echo '[help] Run: npm run fix:format'; exit 1)",
"check:format": "npm run _check:format && npm run _check:format:ja+zh || (echo '[help] Run: npm run fix:format'; exit 1)",
"check:links:internal": "npm run _check:links:internal",
"check:links": "npm run _check:links",
"check:markdown": "scripts/check-markdown-wrapper.sh",
Expand All @@ -62,7 +64,7 @@
"fix:submodules": "npm run _sync",
"fix:text": "npm run check:text -- --fix",
"fix": "npm run fix:all",
"format": "npm run _check:format -- --write",
"format": "npm run _check:format -- --write && npm run _check:format:ja+zh -- --write",
"get:submodule": "npm run _get:${GET:-submodule}",
"install:netlify-cli": "npm list netlify-cli || npm install netlify-cli",
"log:check:links": "npm run check:links | tee tmp/build-log.txt",
Expand Down