aboutsummaryrefslogtreecommitdiff
path: root/files/fr
diff options
context:
space:
mode:
Diffstat (limited to 'files/fr')
-rw-r--r--files/fr/_redirects.txt6
-rw-r--r--files/fr/_wikihistory.json34
-rw-r--r--files/fr/conflicting/learn/javascript/objects/classes_in_javascript/index.md (renamed from files/fr/learn/javascript/objects/object-oriented_js/index.md)4
-rw-r--r--files/fr/learn/javascript/objects/classes_in_javascript/index.md (renamed from files/fr/learn/javascript/objects/inheritance/index.md)4
4 files changed, 25 insertions, 23 deletions
diff --git a/files/fr/_redirects.txt b/files/fr/_redirects.txt
index 4f52dc802f..fd52f541c3 100644
--- a/files/fr/_redirects.txt
+++ b/files/fr/_redirects.txt
@@ -3001,8 +3001,10 @@
/fr/docs/Learn/JavaScript/First_steps/methode_chaine_utile /fr/docs/Learn/JavaScript/First_steps/Useful_string_methods
/fr/docs/Learn/JavaScript/First_steps/tableaux /fr/docs/Learn/JavaScript/First_steps/Arrays
/fr/docs/Learn/JavaScript/Objects/Ajouter_des_fonctionnalités_à_notre_démo_de_balles_rebondissantes /fr/docs/Learn/JavaScript/Objects/Adding_bouncing_balls_features
-/fr/docs/Learn/JavaScript/Objects/Heritage /fr/docs/Learn/JavaScript/Objects/Inheritance
-/fr/docs/Learn/JavaScript/Objects/JS_orienté-objet /fr/docs/Learn/JavaScript/Objects/Object-oriented_JS
+/fr/docs/Learn/JavaScript/Objects/Heritage /fr/docs/Learn/JavaScript/Objects/Classes_in_JavaScript
+/fr/docs/Learn/JavaScript/Objects/Inheritance /fr/docs/Learn/JavaScript/Objects/Classes_in_JavaScript
+/fr/docs/Learn/JavaScript/Objects/JS_orienté-objet /fr/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript
+/fr/docs/Learn/JavaScript/Objects/Object-oriented_JS /fr/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript
/fr/docs/Learn/JavaScript/Objects/Prototypes_Objet /fr/docs/Learn/JavaScript/Objects/Object_prototypes
/fr/docs/Learn/JavaScript/Objects/la_construction_d_objet_en_pratique /fr/docs/Learn/JavaScript/Objects/Object_building_practice
/fr/docs/Learn/Performance/Populating_the_page:_how_browsers_work /fr/docs/Web/Performance/How_browsers_work
diff --git a/files/fr/_wikihistory.json b/files/fr/_wikihistory.json
index 14fc7b1eff..31db3f6c96 100644
--- a/files/fr/_wikihistory.json
+++ b/files/fr/_wikihistory.json
@@ -5125,7 +5125,7 @@
"mouffy"
]
},
- "Learn/JavaScript/Objects/Inheritance": {
+ "Learn/JavaScript/Objects/Classes_in_JavaScript": {
"modified": "2020-07-16T22:32:13.707Z",
"contributors": [
"franssu",
@@ -5151,22 +5151,6 @@
"darthyoh"
]
},
- "Learn/JavaScript/Objects/Object-oriented_JS": {
- "modified": "2020-07-16T22:32:05.419Z",
- "contributors": [
- "grandoc",
- "FloppyJunior",
- "vacarme",
- "zoora",
- "Jetinho",
- "elWombator",
- "manuwhat",
- "antoninha",
- "LDCL",
- "Alpha",
- "SphinxKnight"
- ]
- },
"Learn/JavaScript/Objects/Object_building_practice": {
"modified": "2020-07-16T22:32:31.265Z",
"contributors": [
@@ -42753,6 +42737,22 @@
"Goofy"
]
},
+ "conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript": {
+ "modified": "2020-07-16T22:32:05.419Z",
+ "contributors": [
+ "grandoc",
+ "FloppyJunior",
+ "vacarme",
+ "zoora",
+ "Jetinho",
+ "elWombator",
+ "manuwhat",
+ "antoninha",
+ "LDCL",
+ "Alpha",
+ "SphinxKnight"
+ ]
+ },
"conflicting/Learn_370bfb0fa23e42f4384f010341852c43": {
"modified": "2020-07-16T22:33:41.155Z",
"contributors": [
diff --git a/files/fr/learn/javascript/objects/object-oriented_js/index.md b/files/fr/conflicting/learn/javascript/objects/classes_in_javascript/index.md
index be3d5ffacd..61923716ba 100644
--- a/files/fr/learn/javascript/objects/object-oriented_js/index.md
+++ b/files/fr/conflicting/learn/javascript/objects/classes_in_javascript/index.md
@@ -1,6 +1,6 @@
---
title: Le JavaScript orienté objet pour débutants
-slug: Learn/JavaScript/Objects/Object-oriented_JS
+slug: conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript
tags:
- Apprendre
- Débutant
@@ -10,7 +10,7 @@ tags:
- OOP
- POO
translation_of: Learn/JavaScript/Objects/Object-oriented_JS
-original_slug: Learn/JavaScript/Objects/JS_orienté-objet
+original_slug: Learn/JavaScript/Objects/Object-oriented_JS
---
{{LearnSidebar}}{{PreviousMenuNext("Learn/JavaScript/Objects/Basics", "Learn/JavaScript/Objects/Object_prototypes", "Learn/JavaScript/Objects")}}
diff --git a/files/fr/learn/javascript/objects/inheritance/index.md b/files/fr/learn/javascript/objects/classes_in_javascript/index.md
index 89668811fa..29263128cc 100644
--- a/files/fr/learn/javascript/objects/inheritance/index.md
+++ b/files/fr/learn/javascript/objects/classes_in_javascript/index.md
@@ -1,6 +1,6 @@
---
title: L'héritage au sein de JavaScript
-slug: Learn/JavaScript/Objects/Inheritance
+slug: Learn/JavaScript/Objects/Classes_in_JavaScript
tags:
- Apprendre
- Article
@@ -12,7 +12,7 @@ tags:
- Programmation orientée objet
- Prototype
translation_of: Learn/JavaScript/Objects/Inheritance
-original_slug: Learn/JavaScript/Objects/Heritage
+original_slug: Learn/JavaScript/Objects/Inheritance
---
{{LearnSidebar}}