Skip to content

Commit e7a6289

Browse files
authored
[i18n & ja] Improved fallback config and normalize en doc links (#4627)
1 parent f87b4bd commit e7a6289

File tree

8 files changed

+64
-63
lines changed

8 files changed

+64
-63
lines changed

.htmltest.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ IgnoreDirs:
1010
- ^blog/(\d+/)?page/\d+
1111
IgnoreInternalURLs: # list of paths
1212
IgnoreURLs: # list of regexs of paths or URLs to be ignored
13-
- ^(/zh)?/docs/languages/\w+/(api|examples|registry)/$
14-
- ^(/zh)?/docs/collector/registry/$
15-
- ^(/zh)?/docs/languages/net/(metrics-api|traces-api)/
16-
- ^((/zh)?/docs/migration/)?opencensus/$
17-
- ^/community/end-user/feedback-survey/$
13+
- ^(/..)?/docs/languages/\w+/(api|examples|registry)/$
14+
- ^(/..)?/docs/collector/registry/$
15+
- ^(/..)?/docs/languages/net/(metrics-api|traces-api)/
16+
- ^((/..)?/docs/migration/)?opencensus/$
17+
- ^(/community/end-user/)?feedback-survey/$
1818

1919
- ^https://deploy-preview-\d+--opentelemetry.netlify.app/
2020
- ^https://www\.googletagmanager\.com

content/en/_index.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ show_banner: true
2626

2727
<div class="l-primary-buttons mt-5">
2828

29-
- [Learn more](/docs/what-is-opentelemetry/)
30-
- [Try the demo](/docs/demo/)
31-
- [Explore integrations](/ecosystem/integrations)
29+
- [Learn more](docs/what-is-opentelemetry/)
30+
- [Try the demo](docs/demo/)
31+
- [Explore integrations](/ecosystem/integrations/)
3232

3333
</div>
3434

@@ -37,8 +37,8 @@ show_banner: true
3737
</div>
3838
<div class="l-get-started-buttons">
3939

40-
- [Dev](/docs/getting-started/dev/)
41-
- [Ops](/docs/getting-started/ops/)
40+
- [Dev](docs/getting-started/dev/)
41+
- [Ops](docs/getting-started/ops/)
4242

4343
</div>
4444
{{< /blocks/cover >}}
@@ -50,7 +50,7 @@ generate, collect, and export telemetry data (metrics, logs, and traces) to help
5050
you analyze your software's performance and behavior.
5151

5252
> OpenTelemetry is **generally available** across
53-
> [several languages](/docs/languages/) and is suitable for use.
53+
> [several languages](docs/languages/) and is suitable for use.
5454
5555
{{% /blocks/lead %}}
5656

content/en/community/end-user/_index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ right place!
1818
[OpenTelemetry YouTube channel](https://www.youtube.com/@otel-official)
1919
- To provide feedback and help prioritize issues:
2020
- Participate in a [direct interview/feedback session](interviews-feedback/)
21-
- Take a [survey](/community/end-user/feedback-survey/)
21+
- Take a [survey](feedback-survey/)
2222
- Join a panel discussion (more info coming soon!)
2323
- Vote on issues (more info coming soon!)
2424

content/en/docs/_index.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@ aliases: [/docs/workshop/*]
88
OpenTelemetry, also known as OTel, is a vendor-neutral open source
99
[Observability](concepts/observability-primer/#what-is-observability) framework
1010
for instrumenting, generating, collecting, and exporting telemetry data such as
11-
[traces](/docs/concepts/signals/traces/),
12-
[metrics](/docs/concepts/signals/metrics/), and
13-
[logs](/docs/concepts/signals/logs/).
11+
[traces](concepts/signals/traces/), [metrics](concepts/signals/metrics/), and
12+
[logs](concepts/signals/logs/).
1413

1514
As an industry-standard, OpenTelemetry is
1615
[supported by more than 40 observability vendors](/ecosystem/vendors/),
17-
integrated by many [libraries, services, and apps](/ecosystem/integrations), and
18-
adopted by [numerous end users](/ecosystem/adopters).
16+
integrated by many [libraries, services, and apps](/ecosystem/integrations/),
17+
and adopted by [numerous end users](/ecosystem/adopters/).
1918

2019
![OpenTelemetry Reference Architecture](/img/otel-diagram.svg)

content/en/docs/getting-started/_index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ observability with OpenTelemetry looks like!
2323

2424
</div>
2525

26-
[^1]: If none of these roles apply to you, [let us know!][].
26+
[^1]: If none of these roles apply to you, [let us know][].
2727

2828
[demo]: /ecosystem/demo/
29-
[let us know!]:
29+
[let us know]:
3030
https://github.com/open-telemetry/opentelemetry.io/issues/new?title=Add%20a%20new%20persona:%20My%20Persona&body=Provide%20a%20description%20of%20your%20role%20and%20responsibilities%20and%20what%20your%20observability%20goals%20are

content/en/docs/getting-started/dev.md

+17-17
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,27 @@ OpenTelemetry can help you! To accomplish your goals of having your dependencies
1313
instrumented automatically and instrumenting your own code with our API
1414
manually, we recommend that you learn the following concepts first:
1515

16-
- [What is OpenTelemetry?](/docs/what-is-opentelemetry/)
17-
- [How can I add instrumentation to my code base?](/docs/concepts/instrumentation/code-based/)
16+
- [What is OpenTelemetry?](../../what-is-opentelemetry/)
17+
- [How can I add instrumentation to my code base?](../../concepts/instrumentation/code-based/)
1818

1919
If you develop libraries, frameworks or middleware that is used as a dependency
2020
within other software, we recommend that you learn how you can provide telemetry
2121
natively:
2222

23-
- [How can I add native instrumentation to my library?](/docs/concepts/instrumentation/libraries/)
23+
- [How can I add native instrumentation to my library?](../../concepts/instrumentation/libraries/)
2424

2525
Next, you can deep dive into the documentations for the
26-
[language](/docs/languages/) you are using:
27-
28-
- [C++](/docs/languages/cpp/)
29-
- [.NET](/docs/languages/net/)
30-
- [Erlang / Elixir](/docs/languages/erlang/)
31-
- [Go](/docs/languages/go/)
32-
- [Java](/docs/languages/java/)
33-
- [JavaScript / TypeScript](/docs/languages/js/)
34-
- [PHP](/docs/languages/php/)
35-
- [Python](/docs/languages/python/)
36-
- [Ruby](/docs/languages/ruby/)
37-
- [Rust](/docs/languages/rust/)
38-
- [Swift](/docs/languages/swift/)
39-
- [Other](/docs/languages/other/)
26+
[language](../../languages/) you are using:
27+
28+
- [C++](../../languages/cpp/)
29+
- [.NET](../../languages/net/)
30+
- [Erlang / Elixir](../../languages/erlang/)
31+
- [Go](../../languages/go/)
32+
- [Java](../../languages/java/)
33+
- [JavaScript / TypeScript](../../languages/js/)
34+
- [PHP](../../languages/php/)
35+
- [Python](../../languages/python/)
36+
- [Ruby](../../languages/ruby/)
37+
- [Rust](../../languages/rust/)
38+
- [Swift](../../languages/swift/)
39+
- [Other](../../languages/other/)

content/en/docs/getting-started/ops.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ OpenTelemetry can help you! To accomplish your goal of getting telemetry out of
1414
applications without touching their code, we recommend that you learn the
1515
following:
1616

17-
- [What is OpenTelemetry?](/docs/what-is-opentelemetry/)
18-
- [How can I instrument applications without touching their code?](/docs/concepts/instrumentation/zero-code/)
19-
- [How can I set up a collector?](/docs/collector/)
20-
- [How can I get automation for Kubernetes with the OpenTelemetry Operator?](/docs/kubernetes/operator/)
17+
- [What is OpenTelemetry?](../../what-is-opentelemetry/)
18+
- [How can I instrument applications without touching their code?](../../concepts/instrumentation/zero-code/)
19+
- [How can I set up a collector?](../../collector/)
20+
- [How can I get automation for Kubernetes with the OpenTelemetry Operator?](../../kubernetes/operator/)
2121

2222
If you are looking for a set of applications to try things out, you will find
23-
our official [OpenTelemetry demo](/ecosystem/demo/) useful!
23+
our official [OpenTelemetry demo](/ecosystem/demo/) useful.

hugo.yaml

+24-22
Original file line numberDiff line numberDiff line change
@@ -210,50 +210,52 @@ security:
210210

211211
module:
212212
mounts:
213+
## en
213214
- source: content/en
214215
target: content
216+
- source: tmp/community/mission-vision-values.md
217+
target: content/community/mission.md
218+
- source: tmp/community/roadmap.md
219+
target: content/community/roadmap.md
220+
# Specs, currently en only
221+
- source: tmp/otel/specification
222+
target: content/docs/specs/otel
223+
- source: tmp/opamp
224+
target: content/docs/specs/opamp
225+
- source: tmp/otlp/docs/specification.md
226+
target: content/docs/specs/otlp/_index.md
227+
- source: tmp/otlp/docs/img
228+
target: content/docs/specs/otlp/img
229+
- source: tmp/semconv/docs
230+
target: content/docs/specs/semconv
215231

216232
## ja
217233
- source: content/ja
218234
target: content
219235
lang: ja
220236
# fallback pages
221-
# - excludeFiles: specs/*
222-
# source: content/en/docs
223-
# target: content/docs
224-
# lang: ja
225237
- source: content/en/announcements
226238
target: content/announcements
227239
lang: ja
240+
- excludeFiles: specs/*
241+
source: content/en/docs
242+
target: content/docs
243+
lang: ja
228244

229245
## zh
230246
- source: content/zh
231247
target: content
232248
lang: zh
233249
# fallback pages
250+
- source: content/en/announcements
251+
target: content/announcements
252+
lang: zh
234253
- excludeFiles: specs/*
235254
source: content/en/docs
236255
target: content/docs
237256
lang: zh
238-
- source: content/en/announcements
239-
target: content/announcements
240-
lang: zh
241257

242-
# Other site content
243-
- source: tmp/otel/specification
244-
target: content/docs/specs/otel
245-
- source: tmp/opamp
246-
target: content/docs/specs/opamp
247-
- source: tmp/otlp/docs/specification.md
248-
target: content/docs/specs/otlp/_index.md
249-
- source: tmp/otlp/docs/img
250-
target: content/docs/specs/otlp/img
251-
- source: tmp/semconv/docs
252-
target: content/docs/specs/semconv
253-
- source: tmp/community/mission-vision-values.md
254-
target: content/community/mission.md
255-
- source: tmp/community/roadmap.md
256-
target: content/community/roadmap.md
258+
## static
257259
- source: static
258260
target: static
259261
- source: content-modules/semantic-conventions/schemas

0 commit comments

Comments
 (0)