aboutsummaryrefslogtreecommitdiff
path: root/files/es
diff options
context:
space:
mode:
authorMDN <actions@users.noreply.github.com>2022-01-18 00:57:02 +0000
committerMDN <actions@users.noreply.github.com>2022-01-18 00:57:02 +0000
commit149b599368b4e27cf7d05f270a43519f599372fd (patch)
tree7e31e2b1434a345cad94b028cdf5d294fa21257b /files/es
parenta9248e91ff3d691330714a995987a33cb67b9fa8 (diff)
downloadtranslated-content-149b599368b4e27cf7d05f270a43519f599372fd.tar.gz
translated-content-149b599368b4e27cf7d05f270a43519f599372fd.tar.bz2
translated-content-149b599368b4e27cf7d05f270a43519f599372fd.zip
[CRON] sync translated content
Diffstat (limited to 'files/es')
-rw-r--r--files/es/_redirects.txt2
-rw-r--r--files/es/_wikihistory.json40
-rw-r--r--files/es/conflicting/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/es/learn/javascript/objects/object-oriented_js/index.html)5
-rw-r--r--files/es/learn/javascript/objects/classes_in_javascript/index.html (renamed from files/es/learn/javascript/objects/inheritance/index.html)3
4 files changed, 27 insertions, 23 deletions
diff --git a/files/es/_redirects.txt b/files/es/_redirects.txt
index 2c0faa8c5e..bc65d530bf 100644
--- a/files/es/_redirects.txt
+++ b/files/es/_redirects.txt
@@ -1187,6 +1187,8 @@
/es/docs/Learn/JavaScript/First_steps/Prueba_tus_habilidades:_Strings /es/docs/Learn/JavaScript/First_steps/Test_your_skills:_Strings
/es/docs/Learn/JavaScript/First_steps/Qué_es_JavaScript /es/docs/Learn/JavaScript/First_steps/What_is_JavaScript
/es/docs/Learn/JavaScript/Objects/Ejercicio_práctico_de_construcción_de_objetos /es/docs/Learn/JavaScript/Objects/Object_building_practice
+/es/docs/Learn/JavaScript/Objects/Inheritance /es/docs/Learn/JavaScript/Objects/Classes_in_JavaScript
+/es/docs/Learn/JavaScript/Objects/Object-oriented_JS /es/docs/conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript
/es/docs/Learn/Server-side/Django/Introducción /es/docs/Learn/Server-side/Django/Introduction
/es/docs/Learn/Server-side/Primeros_pasos /es/docs/Learn/Server-side/First_steps
/es/docs/Learn/Server-side/Primeros_pasos/Introducción /es/docs/Learn/Server-side/First_steps/Introduction
diff --git a/files/es/_wikihistory.json b/files/es/_wikihistory.json
index dc0fdd2b06..889610fe22 100644
--- a/files/es/_wikihistory.json
+++ b/files/es/_wikihistory.json
@@ -3249,7 +3249,7 @@
"kevin-loal98"
]
},
- "Learn/JavaScript/Objects/Inheritance": {
+ "Learn/JavaScript/Objects/Classes_in_JavaScript": {
"modified": "2020-07-28T01:53:21.821Z",
"contributors": [
"Fernando-Funes",
@@ -3268,25 +3268,6 @@
"Enesimus"
]
},
- "Learn/JavaScript/Objects/Object-oriented_JS": {
- "modified": "2020-08-08T09:41:13.386Z",
- "contributors": [
- "Nachec",
- "andyesp",
- "Fernando-Funes",
- "jhonarielgj",
- "rimbener",
- "ReneAG",
- "EnekoOdoo",
- "ivanagui2",
- "cristianmarquezp",
- "djdouta",
- "paulaco",
- "martinGerez",
- "anyruizd",
- "Michelangeur"
- ]
- },
"Learn/JavaScript/Objects/Object_building_practice": {
"modified": "2020-07-16T22:32:30.877Z",
"contributors": [
@@ -21214,6 +21195,25 @@
"StripTM"
]
},
+ "conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript": {
+ "modified": "2020-08-08T09:41:13.386Z",
+ "contributors": [
+ "Nachec",
+ "andyesp",
+ "Fernando-Funes",
+ "jhonarielgj",
+ "rimbener",
+ "ReneAG",
+ "EnekoOdoo",
+ "ivanagui2",
+ "cristianmarquezp",
+ "djdouta",
+ "paulaco",
+ "martinGerez",
+ "anyruizd",
+ "Michelangeur"
+ ]
+ },
"conflicting/MDN/Contribute/Getting_started": {
"modified": "2019-01-16T18:56:38.941Z",
"contributors": [
diff --git a/files/es/learn/javascript/objects/object-oriented_js/index.html b/files/es/conflicting/learn/javascript/objects/classes_in_javascript/index.html
index 5eb023c685..8cafe5c160 100644
--- a/files/es/learn/javascript/objects/object-oriented_js/index.html
+++ b/files/es/conflicting/learn/javascript/objects/classes_in_javascript/index.html
@@ -1,6 +1,6 @@
---
title: JavaScript orientado a objetos para principiantes
-slug: Learn/JavaScript/Objects/Object-oriented_JS
+slug: conflicting/Learn/JavaScript/Objects/Classes_in_JavaScript
tags:
- Aprender
- Artículo
@@ -18,8 +18,9 @@ tags:
- Programación orientada a objetos
- instance
- instanciar
- - 'l10n:priority'
+ - l10n:priority
translation_of: Learn/JavaScript/Objects/Object-oriented_JS
+original_slug: Learn/JavaScript/Objects/Object-oriented_JS
---
<div>{{LearnSidebar}}</div>
diff --git a/files/es/learn/javascript/objects/inheritance/index.html b/files/es/learn/javascript/objects/classes_in_javascript/index.html
index e1cbba42da..2af15e98bf 100644
--- a/files/es/learn/javascript/objects/inheritance/index.html
+++ b/files/es/learn/javascript/objects/classes_in_javascript/index.html
@@ -1,7 +1,8 @@
---
title: Herencia en JavaScript
-slug: Learn/JavaScript/Objects/Inheritance
+slug: Learn/JavaScript/Objects/Classes_in_JavaScript
translation_of: Learn/JavaScript/Objects/Inheritance
+original_slug: Learn/JavaScript/Objects/Inheritance
---
<div>{{LearnSidebar}}</div>