Skip to content

Commit

Permalink
chore: fix git patches
Browse files Browse the repository at this point in the history
  • Loading branch information
lacolaco committed Jan 22, 2025
1 parent 56b87d7 commit 73ac052
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 26 deletions.
18 changes: 9 additions & 9 deletions tools/adev-patches/add-global-styles.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
diff --git a/adev/src/local-styles.scss b/adev/src/local-styles.scss
index 4dcf2e82aa..ba311a65f9 100644
index 2c83a2ad4a..9d9b28112a 100644
--- a/adev/src/local-styles.scss
+++ b/adev/src/local-styles.scss
@@ -1 +1,15 @@
-@import './styles/xterm';
\ No newline at end of file
+@import './styles/xterm';
+
@@ -1,3 +1,17 @@
@use './styles/xterm';

@include xterm.xterm();
+// adev-ja overrides
+
+docs-viewer {
+ // `balance` is not good for Japanese headings.
+ h1,
Expand All @@ -16,8 +16,8 @@ index 4dcf2e82aa..ba311a65f9 100644
+ h4,
+ h5,
+ h6 {
+ word-break: auto-phrase;
+ word-break: auto-phrase;
+ }
+ }
+
+}
+
\ No newline at end of file
4 changes: 2 additions & 2 deletions tools/adev-patches/localize-home.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ index 53d930d66d..732d40ec53 100644
@@ -3,8 +3,8 @@
<div class="adev-top-content">
<!-- Banner(s) can be edited here! -->
<a href="https://goo.gle/angular-v19" class="adev-banner" target="_blank">
<a href="https://blog.angular.dev/meet-angular-v19-7b29dfd05b84" class="adev-banner" target="_blank">
- <h1 tabindex="-1">Angular v19 is here!</h1>
- <p class="adev-banner-cta">Watch the all-new developer event now.</p>
- <p class="adev-banner-cta">Read about our newest release.</p>
+ <h1 tabindex="-1">Angular v19 が利用可能です!</h1>
+ <p class="adev-banner-cta">今すぐ開発者向けイベントを見よう!</p>
</a>
Expand Down
4 changes: 2 additions & 2 deletions tools/adev-patches/replace-canonical-host.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/adev/src/app/core/services/header.service.ts b/adev/src/app/core/services/header.service.ts
index ee21c0a837..afe9b7819c 100644
index ac27b818c4..9b34429ee9 100644
--- a/adev/src/app/core/services/header.service.ts
+++ b/adev/src/app/core/services/header.service.ts
@@ -1,7 +1,7 @@
@@ -9,7 +9,7 @@
import {DOCUMENT} from '@angular/common';
import {Injectable, inject} from '@angular/core';

Expand Down
8 changes: 4 additions & 4 deletions tools/adev-patches/set-current-major-verion.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
diff --git a/adev/src/app/app.config.ts b/adev/src/app/app.config.ts
index 1bc572a030..40345f5292 100644
index 52ab0a523c..6cf5be631c 100644
--- a/adev/src/app/app.config.ts
+++ b/adev/src/app/app.config.ts
@@ -77,7 +77,7 @@ export const appConfig: ApplicationConfig = {
provideAnimationsAsync(),
@@ -80,7 +80,7 @@ export const appConfig: ApplicationConfig = {
provideEnvironmentInitializer(() => inject(AnalyticsService)),
{
provide: CURRENT_MAJOR_VERSION,
- useValue: Number(VERSION.major),
+ useValue: 19,
},
{provide: ENVIRONMENT, useValue: environment},
{
{provide: ErrorHandler, useClass: CustomErrorHandler},
11 changes: 6 additions & 5 deletions tools/adev-patches/translate-top-level-banner.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
diff --git a/adev/src/app/app.component.html b/adev/src/app/app.component.html
index 07ffbaf51b..19e4798fac 100644
index e589f35912..828b3c43b7 100644
--- a/adev/src/app/app.component.html
+++ b/adev/src/app/app.component.html
@@ -1,6 +1,6 @@
@@ -2,7 +2,7 @@

@defer (when isBrowser) {
<adev-progress-bar />
- <docs-top-level-banner expiry="2024-12-06" id="state-of-js-2024" link="https://survey.devographics.com/en-US/survey/state-of-js/2024?source=angular_homepage" text="Share your experience with Angular in The State of JavaScript 2024 survey" />
+ <docs-top-level-banner expiry="2024-12-06" id="state-of-js-2024" link="https://survey.devographics.com/en-US/survey/state-of-js/2024?source=angular_homepage" text="State of JavaScript 2024 アンケートであなたの経験を共有しましょう!" />
- <docs-top-level-banner expiry="2024-12-10" id="state-of-js-2024" link="https://survey.devographics.com/en-US/survey/state-of-js/2024?source=angular_homepage" text="Share your experience with Angular in The State of JavaScript 2024 survey" />
+ <docs-top-level-banner expiry="2024-12-10" id="state-of-js-2024" link="https://survey.devographics.com/en-US/survey/state-of-js/2024?source=angular_homepage" text="State of JavaScript 2024 アンケートであなたの経験を共有しましょう!" />
}
<button (click)="focusFirstHeading()" class="adev-skip">Skip to main content</button>

<div class="adev-nav"></div>
8 changes: 4 additions & 4 deletions tools/adev-patches/translate-tutorial-label.patch
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
diff --git a/adev/src/app/features/tutorial/tutorial.component.ts b/adev/src/app/features/tutorial/tutorial.component.ts
index a254df6d80..4ff592b981 100644
index 5ed9051ae2..bb24ca4242 100644
--- a/adev/src/app/features/tutorial/tutorial.component.ts
+++ b/adev/src/app/features/tutorial/tutorial.component.ts
@@ -44,7 +44,7 @@ import {SplitResizerHandler} from './split-resizer-handler.service';
import {TutorialType} from '@angular/docs';
import {TutorialNavigationData, TutorialNavigationItem} from '@angular/docs';
@@ -46,7 +46,7 @@ import {
} from '../../editor/index';
import {SplitResizerHandler} from './split-resizer-handler.service';

-const INTRODUCTION_LABEL = 'Introduction';
+const INTRODUCTION_LABEL = 'イントロダクション';
Expand Down

0 comments on commit 73ac052

Please sign in to comment.