aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/pr-check_redirects.yml1
-rw-r--r--.github/workflows/pr-test.yml17
-rw-r--r--.github/workflows/sync-translated-content.yml23
-rw-r--r--files/fr/learn/server-side/django/skeleton_website/index.html2
-rw-r--r--files/fr/web/api/element/getattributens/index.html2
-rw-r--r--files/ja/_redirects.txt3
-rw-r--r--files/ja/_wikihistory.json24
-rw-r--r--files/ja/orphaned/web/api/response/usefinalurl/index.html (renamed from files/ja/web/api/response/usefinalurl/index.html)3
-rw-r--r--files/ja/web/api/document/getanimations/index.html (renamed from files/ja/web/api/documentorshadowroot/getanimations/index.html)4
9 files changed, 44 insertions, 35 deletions
diff --git a/.github/workflows/pr-check_redirects.yml b/.github/workflows/pr-check_redirects.yml
index 05f463bc57..43b7f6e50f 100644
--- a/.github/workflows/pr-check_redirects.yml
+++ b/.github/workflows/pr-check_redirects.yml
@@ -29,6 +29,7 @@ jobs:
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
+
- uses: actions/cache@v2.1.4
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml
index af6fada9aa..be61826133 100644
--- a/.github/workflows/pr-test.yml
+++ b/.github/workflows/pr-test.yml
@@ -33,16 +33,19 @@ jobs:
with:
node-version: "12"
- - name: Cache node_modules
- uses: actions/cache@v2.1.4
- id: cached-node_modules
+ - name: Get yarn cache directory path
+ id: yarn-cache-dir-path
+ run: echo "::set-output name=dir::$(yarn cache dir)"
+
+ - uses: actions/cache@v2.1.4
+ id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
- path: |
- {{ github.workspace }}/mdn/content/node_modules
- key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-1
+ path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+ key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+ restore-keys: |
+ ${{ runner.os }}-yarn-
- name: Install all yarn packages
- if: steps.cached-node_modules.outputs.cache-hit != 'true'
working-directory: ${{ github.workspace }}/mdn/content
run: |
yarn --frozen-lockfile
diff --git a/.github/workflows/sync-translated-content.yml b/.github/workflows/sync-translated-content.yml
index 4516c68c7c..f47e7f6e5c 100644
--- a/.github/workflows/sync-translated-content.yml
+++ b/.github/workflows/sync-translated-content.yml
@@ -28,21 +28,24 @@ jobs:
with:
node-version: "12"
- - name: Cache node_modules
- uses: actions/cache@v2.1.4
- id: cached-node_modules
+ - name: Get yarn cache directory path
+ id: yarn-cache-dir-path
+ run: echo "::set-output name=dir::$(yarn cache dir)"
+
+ - uses: actions/cache@v2.1.4
+ id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
- path: |
- **/node_modules
- key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+ path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+ key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+ restore-keys: |
+ ${{ runner.os }}-yarn-
- name: Install all yarn packages
- if: steps.cached-node_modules.outputs.cache-hit != 'true'
working-directory: ${{ github.workspace }}/mdn/content
run: |
yarn --frozen-lockfile
- - name: Build changed content
+ - name: Sync translated content
env:
CONTENT_ROOT: ${{ github.workspace }}/mdn/content/files
CONTENT_TRANSLATED_ROOT: ${{ github.workspace }}/files
@@ -58,6 +61,6 @@ jobs:
git remote add upstream "https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
git config --local user.email "actions@users.noreply.github.com"
git config --local user.name "MDN"
- git commit -a -m "[CRON] sync translated content"
- git pull --rebase upstream main
+ git commit -a -m "[CRON] sync translated content" && \
+ git pull --rebase upstream main && \
git push upstream main
diff --git a/files/fr/learn/server-side/django/skeleton_website/index.html b/files/fr/learn/server-side/django/skeleton_website/index.html
index 787db15aec..9bf5f6e1ff 100644
--- a/files/fr/learn/server-side/django/skeleton_website/index.html
+++ b/files/fr/learn/server-side/django/skeleton_website/index.html
@@ -271,7 +271,7 @@ urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)</
</pre>
<div class="note">
-<p><strong>Note</strong>: Il y a plusieurs manière pour ajouter des routes à la variable <code>urlpatterns</code> (dans les étapes décrites ci-dessus nous avons ajouté petit à patir en utilisant l'opérateur <code>+=</code> pour bien séparer les étapes). Il est en réalité tout à fait possible de toput regrouper dans une seule étape :</p>
+<p><strong>Note</strong>: Il y a plusieurs manière pour ajouter des routes à la variable <code>urlpatterns</code> (dans les étapes décrites ci-dessus nous avons ajouté petit à patir en utilisant l'opérateur <code>+=</code> pour bien séparer les étapes). Il est en réalité tout à fait possible de tout regrouper dans une seule étape :</p>
<pre class="brush: python notranslate">urlpatterns = [
  path('admin/', admin.site.urls),
diff --git a/files/fr/web/api/element/getattributens/index.html b/files/fr/web/api/element/getattributens/index.html
index 1a256de5fa..ecd4a98493 100644
--- a/files/fr/web/api/element/getattributens/index.html
+++ b/files/fr/web/api/element/getattributens/index.html
@@ -36,7 +36,7 @@ translation_of: Web/API/Element/getAttributeNS
<h2 id="Exemples">Exemples</h2>
-<p>Le document SVG suivantu utilise une valeur d'attribut <code>foo</code> d'un espace de nom spécifique :</p>
+<p>Le document SVG suivant utilise une valeur d'attribut <code>foo</code> d'un espace de nom spécifique :</p>
<pre class="brush: xml">&lt;svg xmlns="http://www.w3.org/2000/svg"
xmlns:test="http://www.example.com/2014/test" width="40" height="40"&gt;
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index b8f8ea76d9..afbf74fa1e 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -3747,12 +3747,12 @@
/ja/docs/Web/API/Document/defaultView/storage_event /ja/docs/Web/API/Window/storage_event
/ja/docs/Web/API/Document/domConfig /ja/docs/Web/API/Document
/ja/docs/Web/API/Document/elementFromPoint /ja/docs/Web/API/DocumentOrShadowRoot/elementFromPoint
-/ja/docs/Web/API/Document/getAnimations /ja/docs/Web/API/DocumentOrShadowRoot/getAnimations
/ja/docs/Web/API/Document/getSelection /ja/docs/conflicting/Web/API/DocumentOrShadowRoot/getSelection
/ja/docs/Web/API/Document/inputEncoding /ja/docs/conflicting/Web/API/Document/characterSet
/ja/docs/Web/API/Document/onselectionchange /ja/docs/Web/API/GlobalEventHandlers/onselectionchange
/ja/docs/Web/API/DocumentOrShadowRoot/activeElement /ja/docs/Web/API/Document/activeElement
/ja/docs/Web/API/DocumentOrShadowRoot/fullscreenElement /ja/docs/Web/API/Document/fullscreenElement
+/ja/docs/Web/API/DocumentOrShadowRoot/getAnimations /ja/docs/Web/API/Document/getAnimations
/ja/docs/Web/API/DocumentOrShadowRoot/msElementsFromRect /ja/docs/orphaned/Web/API/DocumentOrShadowRoot/msElementsFromRect
/ja/docs/Web/API/DocumentOrShadowRoot/nodeFromPoint /ja/docs/conflicting/Web/API/DocumentOrShadowRoot
/ja/docs/Web/API/DocumentOrShadowRoot/nodesFromPoint /ja/docs/conflicting/Web/API/DocumentOrShadowRoot_20ea0e1d91453a020aad3a16dbce16f1
@@ -3931,6 +3931,7 @@
/ja/docs/Web/API/Range1/startContainer /ja/docs/Web/API/Range/startContainer
/ja/docs/Web/API/Range1/startOffset /ja/docs/Web/API/Range/startOffset
/ja/docs/Web/API/ReadableStreamDefaultController/ReadableStreamDefaultController /ja/docs/orphaned/Web/API/ReadableStreamDefaultController/ReadableStreamDefaultController
+/ja/docs/Web/API/Response/useFinalURL /ja/docs/orphaned/Web/API/Response/useFinalURL
/ja/docs/Web/API/ServiceWorker_API /ja/docs/Web/API/Service_Worker_API
/ja/docs/Web/API/ServiceWorker_API/Using_Service_Workers /ja/docs/Web/API/Service_Worker_API/Using_Service_Workers
/ja/docs/Web/API/Slotable /ja/docs/conflicting/Web/API/Element
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index a34c7be177..3da558db6a 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -20480,12 +20480,6 @@
"eltociear"
]
},
- "Web/API/Response/useFinalURL": {
- "modified": "2020-10-15T22:32:38.418Z",
- "contributors": [
- "eltociear"
- ]
- },
"Web/API/SVGElement": {
"modified": "2020-10-15T21:57:52.067Z",
"contributors": [
@@ -51302,12 +51296,6 @@
"ethertank"
]
},
- "Web/API/DocumentOrShadowRoot/getAnimations": {
- "modified": "2020-10-15T22:32:28.367Z",
- "contributors": [
- "mfuji09"
- ]
- },
"orphaned/Web/API/ReadableStreamDefaultController/ReadableStreamDefaultController": {
"modified": "2020-10-15T22:26:44.153Z",
"contributors": [
@@ -53496,5 +53484,17 @@
"contributors": [
"eltociear"
]
+ },
+ "Web/API/Document/getAnimations": {
+ "modified": "2020-10-15T22:32:28.367Z",
+ "contributors": [
+ "mfuji09"
+ ]
+ },
+ "orphaned/Web/API/Response/useFinalURL": {
+ "modified": "2020-10-15T22:32:38.418Z",
+ "contributors": [
+ "eltociear"
+ ]
}
} \ No newline at end of file
diff --git a/files/ja/web/api/response/usefinalurl/index.html b/files/ja/orphaned/web/api/response/usefinalurl/index.html
index 6f18f681d8..06251f6c71 100644
--- a/files/ja/web/api/response/usefinalurl/index.html
+++ b/files/ja/orphaned/web/api/response/usefinalurl/index.html
@@ -1,6 +1,6 @@
---
title: Response.useFinalURL
-slug: Web/API/Response/useFinalURL
+slug: orphaned/Web/API/Response/useFinalURL
tags:
- API
- Experimental
@@ -11,6 +11,7 @@ tags:
- Response
- useFinalURL
translation_of: Web/API/Response/useFinalURL
+original_slug: Web/API/Response/useFinalURL
---
<div>{{APIRef("Fetch")}}{{obsolete_header}}</div>
diff --git a/files/ja/web/api/documentorshadowroot/getanimations/index.html b/files/ja/web/api/document/getanimations/index.html
index 83900d4b9f..dde6a5530a 100644
--- a/files/ja/web/api/documentorshadowroot/getanimations/index.html
+++ b/files/ja/web/api/document/getanimations/index.html
@@ -1,6 +1,6 @@
---
title: Document.getAnimations()
-slug: Web/API/DocumentOrShadowRoot/getAnimations
+slug: Web/API/Document/getAnimations
tags:
- API
- Animation
@@ -17,7 +17,7 @@ tags:
- waapi
- web animations api
translation_of: Web/API/DocumentOrShadowRoot/getAnimations
-original_slug: Web/API/Document/getAnimations
+original_slug: Web/API/DocumentOrShadowRoot/getAnimations
---
<p>{{ SeeCompatTable() }}{{APIRef("Web Animations")}}</p>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-03-01 02:23:52 +0000