Skip to content

Commit

Permalink
add new grammar points
Browse files Browse the repository at this point in the history 
- added new grammar points to the grammar index. (#295)
  - ～たり～たりする
  - ～ことがある
  - Noun AやNoun B
  • Loading branch information
@SethClydesdale
SethClydesdale committed Jan 29, 2025
1 parent 117ed12 commit 55376c2
Show file tree
Hide file tree
Showing 13 changed files with 259 additions and 24 deletions.
249 changes: 242 additions & 7 deletions lessons-3rd/appendix/grammar-index/index.html
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lessons-3rd/lesson-11/grammar-3/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
<script>Genki.generateQuiz({
format : 'practice',
type : ['multi', 'fill'],
info : 'Tell what the following people did on the weekend using ～たり～たりする.',
info : 'Tell what the following people did on the weekend using {!GRI|～たり～たりする|l11-p2}.',

quizlet : [
[
Expand Down
2 changes: 1 addition & 1 deletion lessons-3rd/lesson-11/grammar-4/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
<script>Genki.generateQuiz({
format : 'practice',
type : ['multi', 'fill'],
info : 'The following are what John has or hasn\'t done. Make sentences using ～ことがある.<br>O = John has done this.<br>X = John hasn\'t done this.',
info : 'The following are what John has or hasn\'t done. Make sentences using {!GRI|～ことがある|l11-p3}.<br>O = John has done this.<br>X = John hasn\'t done this.',

quizlet : [
[
Expand Down
2 changes: 1 addition & 1 deletion lessons-3rd/lesson-11/grammar-5/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
<script>Genki.generateQuiz({
format : 'practice',
type : ['multi', 'fill'],
info : 'Answer the questions in Japanese using や to connect the nouns.',
info : 'Answer the questions in Japanese using {!GRI|や|l11-p4} to connect the nouns.',

quizlet : [
[
Expand Down
6 changes: 3 additions & 3 deletions lessons-3rd/lesson-11/workbook-2/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
<script src="../../../resources/javascript/all.min.js"></script>
<script>Genki.generateQuiz({
type : 'fill',
info : 'Complete the following problems using ～たり～たりする. Pay attention to the sentence ending.',
info : 'Complete the following problems using {!GRI|～たり～たりする|l11-p2}. Pay attention to the sentence ending.',

quizlet :
'<div class="count-problems">'+
'<p class="sectionDesc3rd"><span class="sectionNumber3rd">I</span>Translate the following sentences, using ～たり～たりする.</p>'+
'<p class="sectionDesc3rd"><span class="sectionNumber3rd">I</span>Translate the following sentences, using {!GRI|～たり～たりする|l11-p2}.</p>'+
'<div class="problem">'+
'I watched a movie, shopped, etc., on the weekend.<br>'+
'{週末、映画を見たり、買い物をしたりしました|しゅうまつ、えいがをみたり、かいものをしたりしました|' + Genki.getAlts('{週末}、{映画}を{見}たり、{買い物}をしたりしました', 'しゅうまつ|えいが|み|かいもの') + 'answer}。'+
Expand Down Expand Up @@ -112,7 +112,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
'</div>'+

'<div class="count-problems">'+
'<p class="sectionDesc3rd"><span class="sectionNumber3rd">II</span>Answer the questions by translating the sentences, using ～たり～たりする.</p>'+
'<p class="sectionDesc3rd"><span class="sectionNumber3rd">II</span>Answer the questions by translating the sentences, using {!GRI|～たり～たりする|l11-p2}.</p>'+
'<div class="problem">'+
'デートの<ruby>時<rt>とき</rt></ruby>、<ruby>何<rt>なに</rt></ruby>をしますか。<br>'+
'(When on a date, I watch a movie, eat a meal, etc.)<br>'+
Expand Down
2 changes: 1 addition & 1 deletion lessons-3rd/lesson-11/workbook-3/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
<script src="../../../resources/javascript/all.min.js"></script>
<script>Genki.generateQuiz({
type : 'fill',
info : 'Complete the following problems using ～ことがある.',
info : 'Complete the following problems using {!GRI|～ことがある|l11-p3}.',

quizlet :
'<div class="count-problems">'+
Expand Down
4 changes: 2 additions & 2 deletions lessons-3rd/lesson-11/workbook-4/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
<script src="../../../resources/javascript/all.min.js"></script>
<script>Genki.generateQuiz({
type : 'fill',
info : 'Complete the following problems using ～や～.',
info : 'Complete the following problems using {!GRI|～や～|l11-p4}.',

quizlet :
'<div class="count-problems">'+
'<p class="sectionDesc3rd"><span class="sectionNumber3rd fa">&#xf054;</span>Answer the questions with ～や～ by translating the sentences.</p>'+
'<p class="sectionDesc3rd"><span class="sectionNumber3rd fa">&#xf054;</span>Answer the questions with {!GRI|～や～|l11-p4} by translating the sentences.</p>'+

'<div class="problem">'+
'<ruby>大学<rt>だいがく</rt></ruby>の<ruby>近<rt>ちか</rt></ruby>くに<ruby>何<rt>なに</rt></ruby>がありますか。<br>'+
Expand Down
2 changes: 1 addition & 1 deletion lessons/lesson-11/grammar-3/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
<script src="../../../resources/javascript/all.min.js"></script>
<script>Genki.generateQuiz({
type : 'multi',
info : 'Tell what the following people did on the weekend using ～たり～たりする.',
info : 'Tell what the following people did on the weekend using {!GRI|～たり～たりする|l11-p2}.',

quizlet : [
{
Expand Down
2 changes: 1 addition & 1 deletion lessons/lesson-11/grammar-4/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
<script src="../../../resources/javascript/all.min.js"></script>
<script>Genki.generateQuiz({
type : 'multi',
info : 'The following are what John has or hasn\'t done. Make sentences using ～ことがある.<br>O = John has done this.<br>X = John hasn\'t done this.',
info : 'The following are what John has or hasn\'t done. Make sentences using {!GRI|～ことがある|l11-p3}.<br>O = John has done this.<br>X = John hasn\'t done this.',

quizlet : [
{
Expand Down
2 changes: 1 addition & 1 deletion lessons/lesson-11/grammar-5/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
<script src="../../../resources/javascript/all.min.js"></script>
<script>Genki.generateQuiz({
type : 'multi',
info : 'Answer the questions in Japanese using や to connect the nouns.',
info : 'Answer the questions in Japanese using {!GRI|や|l11-p4} to connect the nouns.',

quizlet : [
{
Expand Down
6 changes: 3 additions & 3 deletions lessons/lesson-11/workbook-2/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
<script src="../../../resources/javascript/all.min.js"></script>
<script>Genki.generateQuiz({
type : 'fill',
info : 'Complete the problems below, using ～たり～たりする.',
info : 'Complete the problems below, using {!GRI|～たり～たりする|l11-p2}.',

quizlet :
'<div class="count-problems">'+
'<p class="section-desc">Translate the following sentences, using ～たり～たりする.</p>'+
'<p class="section-desc">Translate the following sentences, using {!GRI|～たり～たりする|l11-p2}.</p>'+
'<div class="problem">'+
'I watched a movie, shopped, etc., on the weekend.<br>'+
'{週末、映画を見たり、買い物をしたりしました|しゅうまつ、えいがをみたり、かいものをしたりしました|' + Genki.getAlts('{週末}、{映画}を{見}たり、{買い物}をしたりしました', 'しゅうまつ|えいが|み|かいもの') + 'answer}。'+
Expand Down Expand Up @@ -110,7 +110,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
'{りょうでたばこを吸ったり、ビールを飲んだりしてはいけません|りょうでたばこをすったり、ビールをのんだりしてはいけません|' + Genki.getAlts('{寮}でたばこを{吸}ったり、ビールを{飲}んだりしてはいけません', 'りょう|す|の') + 'answer}。'+
'</div>'+

'<p class="section-desc">Answer the questions, using ～たり～たりする.</p>'+
'<p class="section-desc">Answer the questions, using {!GRI|～たり～たりする|l11-p2}.</p>'+
'<div class="problem">'+
'デートの時、何をしますか。<br>'+
'(When on a date, I watch a movie, eat a meal, etc.)<br>'+
Expand Down
2 changes: 1 addition & 1 deletion lessons/lesson-11/workbook-3/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
<script src="../../../resources/javascript/all.min.js"></script>
<script>Genki.generateQuiz({
type : 'fill',
info : 'Practice making sentences of things you have/haven\'t done, using ～ことがある.',
info : 'Practice making sentences of things you have/haven\'t done, using {!GRI|～ことがある|l11-p3}.',

quizlet :
'<div class="count-problems">'+
Expand Down
2 changes: 1 addition & 1 deletion lessons/lesson-11/workbook-4/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>
<script src="../../../resources/javascript/all.min.js"></script>
<script>Genki.generateQuiz({
type : 'fill',
info : 'Answer the questions with ～や～.',
info : 'Answer the questions with {!GRI|～や～|l11-p4}.',

quizlet :
'<div class="count-problems">'+
Expand Down

0 comments on commit 55376c2

Please sign in to comment.