commit 394267124989def147950e996d0198e4f66f9a25
parent 848438f00a8e1a5c72969c80851b4ef4a0fc6a5a
Author: AsherMorgan <59518073+AsherMorgan@users.noreply.github.com>
Date: Sat, 19 Dec 2020 12:07:26 -0800
Add Numbers vocabulary.
Diffstat:
5 files changed, 56 insertions(+), 20 deletions(-)
diff --git a/README.md b/README.md
@@ -11,27 +11,28 @@ Try it out [here](https://ashermorgan.github.io/Spanish-Quizzer/).
## Vocabulary Sets
Spanish-Quizzer comes with many vocabulary sets that can be filtered by word type, tense, direction, and more. Those vocabulary sets are:
- Common Words:
- - Common Adjectives
- - Common Adverbs
- - Common Prepositions
- - Common Transitions
- - Common Verbs
+ - Common Adjectives
+ - Common Adverbs
+ - Common Prepositions
+ - Common Transitions
+ - Common Verbs
- Basic Words:
- - Colors (Los Colores)
- - Days (Los Días)
- - Months (Los Meses)
- - Questions (Las Preguntas)
+ - Colors (Los Colores)
+ - Days (Los Días)
+ - Months (Los Meses)
+ - Numbers (Los Números)
+ - Questions (Las Preguntas)
- Advanced Words:
- - Childhood (La Niñez)
- - Clothes (La Ropa)
- - Family (La Familia)
- - Food (La Comida)
- - Health (La Salud)
- - House (La Casa)
- - Nature (La Naturaleza)
- - Professions (Las Profesiones)
- - Vacations (Las Vacaciones)
- - Weather (La Clima)
+ - Childhood (La Niñez)
+ - Clothes (La Ropa)
+ - Family (La Familia)
+ - Food (La Comida)
+ - Health (La Salud)
+ - House (La Casa)
+ - Nature (La Naturaleza)
+ - Professions (Las Profesiones)
+ - Vacations (Las Vacaciones)
+ - Weather (La Clima)
## Vocabulary Filters
The following filters can be used on vocabulary sets:
diff --git a/js/filterInput.js b/js/filterInput.js
@@ -173,6 +173,7 @@ let filterInput = Vue.component("filterInput", {
case "Days":
case "Months":
+ case "Numbers":
filters["Adjectives"] = false;
filters["Verbs"] = false;
break;
@@ -265,6 +266,7 @@ let filterInput = Vue.component("filterInput", {
<option>Colors</option>
<option>Days</option>
<option>Months</option>
+ <option>Numbers</option>
<option>Questions</option>
</optgroup>
<optgroup label="Advanced Words">
diff --git a/js/global.js b/js/global.js
@@ -149,7 +149,7 @@ function loadVocab() {
// Initialize variables
let setNames = [
"Adjectives", "Adverbs", "Prepositions", "Transitions", "Verbs", // Common words
- "Colors", "Days", "Months", "Questions", // Basic words
+ "Colors", "Days", "Months", "Numbers", "Questions", // Basic words
"Childhood", "Clothes", "Family", "Food", "Health", "House", "Nature", "Professions", "Vacation", "Weather", // Advanced words
];
let progress = 0;
diff --git a/reference.html b/reference.html
@@ -45,6 +45,7 @@
<option>Colors</option>
<option>Days</option>
<option>Months</option>
+ <option>Numbers</option>
<option>Questions</option>
</optgroup>
<optgroup label="Advanced Words">
diff --git a/vocab/Numbers.csv b/vocab/Numbers.csv
@@ -0,0 +1,31 @@
+English,Spanish,Type
+One,Uno,Noun
+Two,Dos,Noun
+Three,Tres,Noun
+Four,Cuatro,Noun
+Five,Cinco,Noun
+Six,Seis,Noun
+Seven,Siete,Noun
+Eight,Ocho,Noun
+Nine,Nueve,Noun
+Ten,Diez,Noun
+Eleven,Once,Noun
+Twelve,Doce,Noun
+Thirteen,Trece,Noun
+Fourteen,Catorce,Noun
+Fifteen,Quince,Noun
+Sixteen,Dieciséis,Noun
+Seventeen,Diecisiete,Noun
+Eighteen,Dieciocho,Noun
+Nineteen,Diecinueve,Noun
+Twenty,Veinte,Noun
+Thirty,Treinta,Noun
+Fourty,Cuarenta,Noun
+Fifty,Cincuenta,Noun
+Sixty,Sesenta,Noun
+Seventy,Setenta,Noun
+Eighty,Ochenta,Noun
+Ninety,Noventa,Noun
+Hundred,Cien,Noun
+Thousand,Mil,Noun
+Million,Millón,Noun
+\ No newline at end of file