Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Several fixes. #57

Open
wants to merge 67 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
b8803b5
JI-3231 Fix limit xAPI trigger on change event
Feb 10, 2022
6e65a43
Bump
fnoks Feb 10, 2022
520eba0
Update node modules
fnoks Feb 10, 2022
3b527bf
Rename content type title
fnoks Feb 10, 2022
861727d
JI-3231 Bring back on-anykey to not change behaviour
fnoks Feb 10, 2022
5b64557
JI-3237 Remove Auto-check + add Check button
j0kerZ Feb 14, 2022
1cb2a47
JI-3237 Stop Ractive debug mode
j0kerZ Feb 14, 2022
790ccce
JI-3237 Remove highlight marks from report
j0kerZ Feb 14, 2022
0bfdca8
Add content type icon
fnoks Feb 15, 2022
424b88e
JI-2771 Add submit text (#2)
Languafe Feb 15, 2022
6ef9f75
Bump
fnoks Feb 15, 2022
11866a5
Merge branch 'master' into JI-3237-several-issues-in-complex-advanced…
j0kerZ Feb 15, 2022
99b3f63
JI-3237 Remove autocheck from language files
j0kerZ Feb 16, 2022
309911d
Fix invalid options in semantics
fnoks Feb 16, 2022
d7c8914
Merge pull request #1 from h5p/JI-3237-several-issues-in-complex-adva…
fnoks Feb 16, 2022
b59e4f1
Merge branch 'master' of github.com:h5p/h5p-advanced-blanks
fnoks Feb 16, 2022
8795024
Bump
fnoks Feb 16, 2022
ef9c9ab
Fix translation files
fnoks Feb 16, 2022
29b325c
JI-3249 Fix timer when user retry and attempt again
Feb 16, 2022
ad491a6
Merge pull request #3 from h5p/JI-3249-CFITB-reset-timer-on-retry
fnoks Feb 16, 2022
9f9fc11
Bump
fnoks Feb 16, 2022
b0ffbc9
JI-3292 Revert "JI-3237 Remove Auto-check + add Check button"
j0kerZ Feb 24, 2022
a0bd13f
JI-3292 Revert "JI-3237 Remove autocheck from language files"
j0kerZ Feb 24, 2022
46a13cf
JI-3292 Make autocheck only submit when fully filled
j0kerZ Feb 24, 2022
8eb1027
Merge pull request #4 from h5p/JI-3292-complex-fitb-get-back-auto-che…
icc Feb 28, 2022
c8776df
Bump
fnoks Mar 8, 2022
5b2f473
Merge branch 'release'
fnoks Mar 15, 2022
b57b471
Recursive bump H5P.Audio + Video
fnoks Apr 11, 2022
dde092f
Merge branch 'master' into release
fnoks Apr 11, 2022
82eeece
Merge branch 'release'
fnoks Apr 11, 2022
e75a1fc
Update dutch translation for submit button
fnoks May 3, 2022
a4ff00e
Merge branch 'release'
fnoks May 19, 2022
0f9d114
Bump terser from 4.8.0 to 4.8.1
dependabot[bot] Jul 21, 2022
44db056
Merge pull request #6 from h5p/dependabot/npm_and_yarn/terser-4.8.1
fnoks Aug 9, 2022
dbda151
Merge branch 'master' into release
fnoks Aug 19, 2022
bc2399a
Bump
fnoks Aug 19, 2022
be837a0
Update NPM
fnoks Sep 20, 2022
16672e3
Merge branch 'release'
fnoks Sep 20, 2022
a46be5a
Bump got and ava (#7)
dependabot[bot] Oct 10, 2022
25bbfdb
Bump loader-utils from 1.4.0 to 1.4.2 (#11)
dependabot[bot] Nov 18, 2022
71af3e7
Bump minimatch from 3.0.4 to 3.1.2 (#10)
dependabot[bot] Nov 18, 2022
22b0fb1
Bump ansi-regex from 4.1.0 to 6.0.1 (#8)
dependabot[bot] Nov 18, 2022
9557415
Merge branch 'master' into release
fnoks Nov 18, 2022
7e6d7f3
Bump
fnoks Nov 18, 2022
0ab6f0b
Merge branch 'release'
fnoks Nov 18, 2022
9f2fcab
Bump decode-uri-component from 0.2.0 to 0.2.2 (#12)
dependabot[bot] Dec 30, 2022
77b6362
Update node modules
fnoks Jan 6, 2023
107fb01
Merge branch 'master' into release
fnoks Jan 6, 2023
264f361
Bump
fnoks Jan 6, 2023
3194835
Merge branch 'release'
fnoks Jan 6, 2023
2862c53
Update ractive and dependencies
fnoks May 3, 2023
320d4c3
Bump @babel/traverse from 7.21.4 to 7.23.2 (#14)
dependabot[bot] Oct 19, 2023
b3fbdbe
Bump postcss from 8.4.23 to 8.4.31 (#13)
dependabot[bot] Oct 26, 2023
bff46ef
Merge branch 'master' into release
fnoks Dec 4, 2023
f2d417f
Bump
fnoks Dec 4, 2023
5dd4890
Merge branch 'release'
fnoks Dec 4, 2023
d3b1ce2
Avoid using dist.js since Drupal doesn't like it
fnoks Feb 23, 2024
d15a81a
Update NPM
fnoks Feb 23, 2024
d585d58
Bump patch version
fnoks Feb 23, 2024
58b5e36
Merge branch 'release'
fnoks Mar 25, 2024
e084f23
Bump braces from 3.0.2 to 3.0.3 (#16)
dependabot[bot] Jun 19, 2024
3480dcb
Bump webpack from 5.81.0 to 5.94.0
dependabot[bot] Aug 30, 2024
968e9b7
Merge pull request #17 from h5p/dependabot/npm_and_yarn/webpack-5.94.0
larsmagu Oct 17, 2024
ac1fbdf
JI-6913 Add reusable workflow for translation validation
Dec 20, 2024
0977fe9
Merge pull request #19 from h5p/JI-6913-Reusable-Workflow--Implement-…
larsmagu Jan 21, 2025
427fd27
Update NPMs
fnoks Jan 22, 2025
aa929bc
Bump
fnoks Jan 22, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
JI-2771 Add submit text (#2)
Authored-by: Thomas Marstrander <[email protected]>
Languafe authored Feb 15, 2022
commit 424b88e0ee286978c08c4d1ebe16e763466595dd
4 changes: 4 additions & 0 deletions language/.en.json
Original file line number Diff line number Diff line change
@@ -228,6 +228,10 @@
"label": "Text for \"Check\" button",
"default": "Check"
},
{
"label": "Text for \"Submit\" button",
"default": "Submit"
},
{
"label": "Text for \"Not filled out\" message",
"default": "Please fill in all blanks to view solution"
24 changes: 14 additions & 10 deletions language/af.json
Original file line number Diff line number Diff line change
@@ -6,6 +6,9 @@
{
"label": "Tipe",
"description": "Opsionele media wat bo die vraag vertoon word."
},
{
"label": "Disable image zooming for question image"
}
]
},
@@ -154,8 +157,7 @@
{
"label": "Die gebruiker tik die antwoorde in."
}
],
"default": "besig om te tik"
]
},
{
"label": "Alternatiewe beskikbaar vir keuse",
@@ -166,8 +168,7 @@
{
"label": "Die regte antwoorde van al die ander oop spasies"
}
],
"default": "alternatiewe"
]
},
{
"label": "Maksimum aantal alternatiewe beskikbaar vir ander oop spasies",
@@ -185,8 +186,7 @@
{
"label": "Beskou dit as 'n gereelde fout"
}
],
"default": "fout"
]
},
{
"label": "Hooflettergevoelig",
@@ -208,11 +208,11 @@
"label": "Aktiveer \"Toets\" knoppie"
},
{
"label": "Deaktiveer prentzoomfunksie vir vraagprent"
"label": "Deaktiveer prentzoomfunksie vir vraagprent",
"description": "This options is not compatible with the \"Automatically check answers after input\" option"
},
{
"label": "Wys bevestigingdialoog op \"Toets\"",
"description": "Hierdie keuses is nie versoenbaar met die opsie \"Gaan antwoorde outomaties na invoer na\" nie"
"label": "Wys bevestigingdialoog op \"Toets\""
},
{
"label": "Wys bevestigingdialoog op \"Probeer weer\""
@@ -231,6 +231,10 @@
"label": "Teks vir \"Toets\" knoppie",
"default": "Toets"
},
{
"label": "Text for \"Submit\" button",
"default": "Submit"
},
{
"label": "Teks vir \"Nie ingevul\" boodskap",
"default": "Vul asb. al die oop spasies in om die antwoord te sien"
@@ -291,4 +295,4 @@
"default": "Jy het :num uit :total punte gekry"
}
]
}
}
6 changes: 5 additions & 1 deletion language/de.json
Original file line number Diff line number Diff line change
@@ -229,6 +229,10 @@
"label": "Beschriftung des \"Überprüfen\"-Buttons",
"default": "Überprüfen"
},
{
"label": "Text for \"Submit\" button",
"default": "Submit"
},
{
"label": "Text der \"Nicht ausgefüllt\"-Nachricht",
"default": "Bitte fülle alle Lücken aus, um die Lösung ansehen zu können"
@@ -289,4 +293,4 @@
"default": "Du hast :num von :total Punkten erreicht"
}
]
}
}
6 changes: 5 additions & 1 deletion language/es-mx.json
Original file line number Diff line number Diff line change
@@ -228,6 +228,10 @@
"label": "Texto para botón \"Comprobar\"",
"default": "Comprobar"
},
{
"label": "Text for \"Submit\" button",
"default": "Submit"
},
{
"label": "Texto para mensaje \"No completado\"",
"default": "Por favor llene todos los huecos para ver la solución"
@@ -288,4 +292,4 @@
"default": "Obtuvo :num de un total de :total puntos"
}
]
}
}
6 changes: 5 additions & 1 deletion language/es.json
Original file line number Diff line number Diff line change
@@ -228,6 +228,10 @@
"label": "Texto para botón \"Comprobar\"",
"default": "Comprobar"
},
{
"label": "Text for \"Submit\" button",
"default": "Submit"
},
{
"label": "Texto para mensaje \"No completado\"",
"default": "Por favor llene todos los huecos para ver la solución"
@@ -288,4 +292,4 @@
"default": "Obtuvo :num de un total de :total puntos"
}
]
}
}
6 changes: 5 additions & 1 deletion language/fi.json
Original file line number Diff line number Diff line change
@@ -228,6 +228,10 @@
"label": "Teksti \"Check\" painikkeelle",
"default": "Tarkista"
},
{
"label": "Text for \"Submit\" button",
"default": "Submit"
},
{
"label": "Teksti \"Not filled out\" viestille",
"default": "Ole hyvä ja täytä kaikki aukkokohdat nähdäksesi vastaukset"
@@ -288,4 +292,4 @@
"default": "Sait :num pistettä :total pisteestä"
}
]
}
}
6 changes: 5 additions & 1 deletion language/fr.json
Original file line number Diff line number Diff line change
@@ -228,6 +228,10 @@
"label": "Texte du bouton \"Vérifier\"",
"default": "Vérifier"
},
{
"label": "Text for \"Submit\" button",
"default": "Submit"
},
{
"label": "Texte pour le message \"Tout n'est pas complété\"",
"default": "Vous devez avoir rempli tous les blancs avant de voir la correction"
@@ -288,4 +292,4 @@
"default": "Vous avez obtenu :num points sur un total de :points"
}
]
}
}
6 changes: 5 additions & 1 deletion language/nl.json
Original file line number Diff line number Diff line change
@@ -228,6 +228,10 @@
"label": "Tekst voor de knop \"Controleer\"",
"default": "Controleer"
},
{
"label": "Text for \"Submit\" button",
"default": "Submit"
},
{
"label": "Tekst voor het bericht \"Niet ingevuld\"",
"default": "Alle velden moeten worden ingevuld voordat de oplossing kan worden getoond"
@@ -288,4 +292,4 @@
"default": "Je hebt :aantal van het :totaal aantal punten"
}
]
}
}
6 changes: 5 additions & 1 deletion language/ru.json
Original file line number Diff line number Diff line change
@@ -228,6 +228,10 @@
"label": "Текст для кнопки \"Проверить\" ",
"default": "Проверить"
},
{
"label": "Text for \"Submit\" button",
"default": "Submit"
},
{
"label": "Текст для сообщения \"Не заполнено до конца\" ",
"default": "Пожалуйста, заполните все поля, чтобы увидеть решение"
@@ -288,4 +292,4 @@
"default": "У тебя :num из :total баллов"
}
]
}
}
6 changes: 5 additions & 1 deletion language/sr.json
Original file line number Diff line number Diff line change
@@ -228,6 +228,10 @@
"label": "Ознака за \"Провери\" дугме",
"default": "Провери"
},
{
"label": "Text for \"Submit\" button",
"default": "Submit"
},
{
"label": "Ознака за \"Није попуњено\" поруку",
"default": "Молимо вас попуните све празнине да бисте видели решење"
@@ -288,4 +292,4 @@
"default": "Освојили сте :num од :total поена"
}
]
}
}
9 changes: 9 additions & 0 deletions semantics.json
Original file line number Diff line number Diff line change
@@ -530,6 +530,15 @@
"common": true,
"optional": true
},
{
"label": "Text for \"Submit\" button",
"importance": "low",
"name": "submitAnswer",
"type": "text",
"default": "Submit",
"common": true,
"optional": true
},
{
"label": "Text for \"Not filled out\" message",
"importance": "low",
18 changes: 11 additions & 7 deletions src/scripts/app.ts
Original file line number Diff line number Diff line change
@@ -57,11 +57,13 @@ export default class AdvancedBlanks extends (H5P.Question as { new(): any; }) {
behaviour: {
mode: 'typing',
selectAlternatives: 'alternatives'
}
},
submitAnswer: 'Submit',
}, config);

this.jQuery = H5P.jQuery;
this.contentId = contentId;
this.contentData = contentData;

let unwrapper = new Unrwapper(this.jQuery);

@@ -204,12 +206,14 @@ export default class AdvancedBlanks extends (H5P.Question as { new(): any; }) {
// Check answer button
this.addButton('check-answer', this.localization.getTextFromLabel(LocalizationLabels.checkAllButton),
this.onCheckAnswer, true, {}, {
confirmationDialog: {
enable: this.settings.confirmCheckDialog,
l10n: this.localization.getObjectForStructure(LocalizationStructures.confirmCheck),
instance: this,
$parentElement: $container
}
confirmationDialog: {
enable: this.settings.confirmCheckDialog,
l10n: this.localization.getObjectForStructure(LocalizationStructures.confirmCheck),
instance: this,
$parentElement: $container,
},
contentData: this.contentData,
textIfSubmitting: this.localization.getTextFromLabel(LocalizationLabels.submitAllButton),
});
}

3 changes: 2 additions & 1 deletion src/scripts/services/localization.ts
Original file line number Diff line number Diff line change
@@ -2,10 +2,11 @@
showSolutionButton = "showSolutions",
retryButton = "tryAgain",
checkAllButton = "checkAnswer",
submitAllButton = "submitAnswer",
notFilledOutWarning = "notFilledOut",
tipButton ="tipLabel",
typoMessage = "spellingMistakeWarning",
scoreBarLabel = "scoreBarLabel"
scoreBarLabel = "scoreBarLabel"
}

export enum LocalizationStructures {