fixed last merge
This commit is contained in:
parent
8e7616e490
commit
c0c64d1912
@ -21,9 +21,9 @@ end
|
||||
|
||||
function lesson(number)
|
||||
number = tonumber(number)
|
||||
local t = scandir(dir.."/content/lessons/")
|
||||
local t = scandir(dir.."/heonian-content/lessons/")
|
||||
if t[number] then
|
||||
dofile("content/lessons/"..t[number])
|
||||
dofile("heonian-content/lessons/"..t[number])
|
||||
else
|
||||
print("lesson not found")
|
||||
end
|
||||
|
6
lexicon
6
lexicon
@ -18,8 +18,8 @@ require "add_word"
|
||||
require "edit_word"
|
||||
require "lessons"
|
||||
|
||||
data_get = "content/words.lua"
|
||||
data_output = "content/words.lua"
|
||||
data_get = "heonian-content/words.lua"
|
||||
data_output = "heonian-content/words.lua"
|
||||
|
||||
words = dofile(data_get)
|
||||
|
||||
@ -123,7 +123,7 @@ Parameters:
|
||||
else
|
||||
if arg[2] then lesson(arg[2])
|
||||
else
|
||||
print("specify a lesson",table.unpack(getFormattedLessonNames(dir.."/content/lessons/")))
|
||||
print("specify a lesson",table.unpack(getFormattedLessonNames(dir.."/heonian-content/lessons/")))
|
||||
end
|
||||
end
|
||||
return
|
||||
|
Loading…
Reference in New Issue
Block a user