Skip to content

Commit d538536

Browse files
robinpalatrobinpalat
committed
update
1 parent afc6e88 commit d538536

File tree

5 files changed

+40
-39
lines changed

5 files changed

+40
-39
lines changed

‎addons/Resources/test.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,7 @@ function test_() {
382382
}
383383

384384
function dlg_progress_2() {
385-
yad --progress --title="$(gettext "Checking resource availability...")" \
386-
--text="<b>$(gettext "Please wait.")</b>" \
385+
yad --progress --title="$(gettext "Run tests, please wait...")" \
387386
--name=Idiomind --class=Idiomind \
388387
--window-icon=$DS/images/logo.png --align=right \
389388
--progress-text=" " \

‎cnfg.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ set_lang() {
7474
}
7575

7676
config_dlg() {
77-
sz=(400 480)
77+
sz=(430 485)
7878
kill_icon=0
7979
source "$DS/default/sets.cfg"
8080

‎images/img.2.png‎

-320 Bytes
Loading

‎main.sh‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -382,10 +382,10 @@ function topic() {
382382
export cnf3=$(mktemp "$DT/cnf3.XXXXXX")
383383
export cnf4=$(mktemp "$DT/cnf4.XXXXXX")
384384

385-
labels_level=( "$(gettext "Fresh topic")" "$(gettext "Fresh topic")" "$(gettext "Fresh topic")" "$(gettext "Familiar topic")" "$(gettext "Familiar topic")" "$(gettext "Familiar topic")" "$(gettext "Intermediate-level")" "$(gettext "intermediate-level")" "$(gettext "To mastered topic")" "$(gettext "Mastered topic")" )
385+
labels_level=( "$(gettext "Fresh topic")" "$(gettext "Fresh topic")" "$(gettext "Fresh topic")" "$(gettext "Fresh topic")" "$(gettext "Familiar topic")" "$(gettext "Familiar topic")" "$(gettext "Familiar topic")" "$(gettext "Familiar topic")" "$(gettext "Familiar topic")" "$(gettext "Mastered topic")" )
386386

387387
if [ "$stts" -eq 1 ]; then
388-
labels_status=("$(gettext "Learning...")" "$(gettext "Reviewing, first out of 9 ...")" "$(gettext "Reviewing, second out of 9 ...")" "$(gettext "Reviewing, third out of 9 ...")" "$(gettext "Reviewing, fourth out of 9 ...")" "$(gettext "Reviewing, Fifth out of 9 ...")" "$(gettext "Reviewing, Sixth out of 9 ...")" "$(gettext "Reviewing, seventh out of 9 ...")" "$(gettext "Reviewing, final review")" "$(gettext "Reviewing, final review")")
388+
labels_status=("$(gettext "Learning...")" "$(gettext "Reviewing for the first time ...")" "$(gettext "Reviewing for the second time ...")" "$(gettext "Reviewing for the third time ...")" "$(gettext "Reviewing for the fourth time ...")" "$(gettext "Reviewing for the fifth time ...")" "$(gettext "Reviewing for the sixth time ...")" "$(gettext "Reviewing for the seventh time ...")" "$(gettext "Reviewing, final review")" "$(gettext "Reviewing, final review")")
389389
[ "$repass" -gt 0 ] && btn_review="$(gettext "Finalize Review")" || btn_review="$(gettext "Mark as Learnt")"
390390

391391
elif [ "$stts" -eq 3 ] || [ "$stts" -eq 4 ] ; then
@@ -395,7 +395,7 @@ function topic() {
395395

396396
elif [ $stts = 5 ] || [ $stts = 6 ]; then
397397

398-
labels_status=("$(gettext "Learning...")" "$(gettext "Reviewing, first out of 9 ...")" "$(gettext "Reviewing, second out of 9 ...")" "$(gettext "Reviewing, third out of 9 ...")" "$(gettext "Reviewing, fourth out of 9 ...")" "$(gettext "Reviewing, Fifth out of 9 ...")" "$(gettext "Reviewing, Sixth out of 9 ...")" "$(gettext "Reviewing, seventh out of 9 ...")" "$(gettext "Reviewing, final review")" "$(gettext "Reviewing, final review")")
398+
labels_status=("$(gettext "Learning...")" "$(gettext "Reviewing for the first time ...")" "$(gettext "Reviewing for the second time ...")" "$(gettext "Reviewing for the third time ...")" "$(gettext "Reviewing for the fourth time ...")" "$(gettext "Reviewing for the fifth time ...")" "$(gettext "Reviewing for the sixth time ...")" "$(gettext "Reviewing for the seventh time ...")" "$(gettext "Reviewing, final review")" "$(gettext "Reviewing, final review")")
399399
label_review="${labels_review[$repass]}"
400400
btn_review="$(gettext "Finalize Review")"
401401

@@ -416,7 +416,14 @@ function topic() {
416416
else
417417
export infolbl5="<small>$(gettext "Created on") $dtec</small>"
418418
fi
419-
export lbl1="<span font_desc='Free Sans Bold 12'>${tpc} $stts - $repass</span>\n<small><i>$label_level</i></small>\n\n<small>$(gettext "Notes:") $cfg4 $(gettext "Sentences"), $cfg3 $(gettext "Words")</small>\n$infolbl5\n"
419+
if [[ $stts = 2 ]]; then
420+
lbl1="<span font_desc='Free Sans Bold 12'>${tpc}</span>\n<b><span color='#805D9D'>$label_level</span></b>\n\n<small>$(gettext "Notes:") $cfg4 $(gettext "Sentences"), $cfg3 $(gettext "Words")</small>\n$infolbl5\n"
421+
elif [[ $((stts%2)) = 0 ]] then
422+
lbl1="<span font_desc='Free Sans Bold 12'>${tpc}</span>\n<small><i><span color='#A37053'>$label_level</span></i></small>\n\n<small>$(gettext "Notes:") $cfg4 $(gettext "Sentences"), $cfg3 $(gettext "Words")</small>\n$infolbl5\n"
423+
else
424+
lbl1="<span font_desc='Free Sans Bold 12'>${tpc}</span>\n<small><i><span color='#A2DFE7'>$label_level</span></i></small>\n\n<small>$(gettext "Notes:") $cfg4 $(gettext "Sentences"), $cfg3 $(gettext "Words")</small>\n$infolbl5\n"
425+
fi
426+
export lbl1
420427
}
421428

422429
oclean() { cleanups "$cnf1" "$cnf3" "$cnf4" "$DT/tpc_lk"; }

‎mngr.sh‎

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -752,6 +752,7 @@ rename_topic() {
752752

753753

754754
mark_to_learn_topic() {
755+
755756
[ ! -s "${DC_tlt}/data" ] && exit 1
756757
if [ "${tpc}" != "${2}" ]; then
757758
msg "$(gettext "Sorry, this topic is currently not active.")\n " \
@@ -765,28 +766,23 @@ mark_to_learn_topic() {
765766
export lns=$(cat "${DC_tlt}/data" |wc -l)
766767
stts=$(sed -n 1p "${DC_tlt}/stts")
767768
! [[ ${stts} =~ ${numer} ]] && stts=1
768-
repass=$(tpc_db 1 config repass)
769+
date_reviews_count="$(tpc_db 5 reviews |grep -c '[^[:space:]]')"
769770

770771
calculate_review "${tpc}"
771772

772-
if [[ $repass -ge 8 ]]; then
773+
if [[ $date_reviews_count -ge 9 ]]; then
773774
echo 2 > "${DC_tlt}/stts"
774775
elif [ $((stts%2)) = 0 ]; then
775776
echo 6 > "${DC_tlt}/stts"
776777
else
777-
if [ ${days_to_review_porcent} -ge 50 ]; then
778-
echo 5 > "${DC_tlt}/stts"
779-
else
780-
echo 1 > "${DC_tlt}/stts"
781-
fi
778+
echo 5 > "${DC_tlt}/stts"
782779
fi
783780

784781
if [[ ${3} = 1 ]]; then
785782
yad_kill "yad --form " "yad --multi-progress " \
786783
"yad --editable --list" "yad --text-info " "yad --notebook "
787784
fi
788785

789-
date_reviews_count="$(tpc_db 5 reviews |grep -c '[^[:space:]]')"
790786
tpc_db 9 config repass ${date_reviews_count}
791787
export data="${DC_tlt}/data" tpcdb
792788

@@ -824,6 +820,7 @@ PY
824820
}
825821

826822
mark_as_learned_topic() {
823+
827824
if [[ "${3}" != 0 ]]; then
828825
if [ "${tpc}" != "${2}" ]; then
829826
msg "$(gettext "Sorry, this topic is currently not active.")\n " \
@@ -843,25 +840,23 @@ mark_as_learned_topic() {
843840

844841
calculate_review "${tpc}"
845842
date_reviews_count="$(tpc_db 5 reviews |grep -c '[^[:space:]]')"
846-
repass=$(tpc_db 1 config repass)
847843
datex=$(date +%m/%d/%Y)
848844

849845
if [ ${date_reviews_count} -gt 0 ]; then
850846
! [[ ${date_reviews_count} =~ ${numer} ]] && date_reviews_count=1
851-
if [ ${date_reviews_count} -eq 4 ]; then
847+
if [ ${date_reviews_count} -eq 3 ]; then
852848
stts=$((stts+1))
853849
fi
854-
if [ ${days_to_review_porcent} -ge 50 ]; then
855-
if [ ${date_reviews_count} -eq 8 ]; then
856-
tpc_db 9 reviews date8 ${datex}
857-
858-
elif [ ${date_reviews_count} -gt 8 ]; then
859-
tpc_db 9 reviews date8 ${datex}
860-
else
861-
date_reviews_count=$((date_reviews_count+1))
862-
tpc_db 9 reviews date${date_reviews_count} ${datex} # FIX
863-
fi
864-
fi
850+
851+
if [ ${date_reviews_count} -eq 9 ]; then
852+
tpc_db 9 reviews date9 ${datex}
853+
854+
elif [ ${date_reviews_count} -gt 9 ]; then
855+
tpc_db 9 reviews date9 ${datex}
856+
else
857+
date_reviews_count=$((date_reviews_count+1))
858+
tpc_db 9 reviews date${date_reviews_count} ${datex} # FIX
859+
fi
865860
else
866861
tpc_db 9 reviews date1 ${datex}
867862
fi
@@ -870,7 +865,7 @@ mark_as_learned_topic() {
870865
(cd "${DC_tlt}/practice"; rm ./.*; rm ./*
871866
touch ./log1 ./log2 ./log3)
872867
fi
873-
if [[ $repass -ge 8 ]]; then
868+
if [[ $date_reviews_count -ge 9 ]]; then
874869
echo 2 > "${DC_tlt}/stts"
875870
elif [[ $((stts%2)) = 0 ]]; then
876871
echo 4 > "${DC_tlt}/stts"
@@ -933,18 +928,18 @@ mark_as_learned_topic_ok() {
933928
datex=$(date +%m/%d/%Y)
934929

935930
if [ ${date_reviews_count} -gt 0 ]; then
936-
if [ ${date_reviews_count} -eq 4 ]; then
931+
if [ ${date_reviews_count} -eq 3 ]; then
937932
stts=$((stts+1))
938933
fi
939-
if [ ${days_to_review_porcent} -ge 50 ]; then
940-
if [ ${date_reviews_count} -eq 8 ]; then
941-
tpc_db 9 reviews date8 ${datex}
942-
elif [ ${date_reviews_count} -gt 8 ]; then
943-
tpc_db 9 reviews date8 ${datex}
944-
else
945-
tpc_db 9 reviews date${date_reviews_count} ${datex} # FIX
946-
fi
934+
935+
if [ ${date_reviews_count} -eq 9 ]; then
936+
tpc_db 9 reviews date9 ${datex}
937+
elif [ ${date_reviews_count} -gt 9 ]; then
938+
tpc_db 9 reviews date9 ${datex}
939+
else
940+
tpc_db 9 reviews date${date_reviews_count} ${datex} # FIX
947941
fi
942+
948943
else
949944
date_reviews_count=$((date_reviews_count+1))
950945
tpc_db 9 reviews date1 ${datex}
@@ -955,7 +950,7 @@ mark_as_learned_topic_ok() {
955950
touch ./log1 ./log2 ./log3)
956951
fi
957952

958-
if [[ $repass -ge 8 ]]; then
953+
if [[ $date_reviews_count -ge 9 ]]; then
959954
echo 2 > "${DC_tlt}/stts"
960955
elif [[ $((stts%2)) = 0 ]]; then
961956
echo 4 > "${DC_tlt}/stts"

0 commit comments

Comments
 (0)