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.

Sign up for GitHub

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

fix: JavaScript translations #20

Merged
merged 9 commits into from
Sep 18, 2023
Merged

fix: JavaScript translations #20

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fe6fec7
feat: add statici18n in installed apps and required configuration
BryanttV Sep 14, 2023
ecf076d
refactor: update compile_translations command
BryanttV Sep 14, 2023
338278f
feat: add javascript translations
BryanttV Sep 14, 2023
d9316d5
chore: update translations
BryanttV Sep 14, 2023
7604277
fix: turn language name (en-us) into a locale name (en_US)
BryanttV Sep 14, 2023
85f3226
test: update current unit test
BryanttV Sep 15, 2023
4670b80
refactor: address PR review
BryanttV Sep 15, 2023
48e2d43
chore: add missing translations
BryanttV Sep 18, 2023
517449b
docs: update changelog for latest changes and bumping the version
BryanttV Sep 18, 2023
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
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ EXTRACT_DIR := $(PACKAGE_NAME)/locale/en/LC_MESSAGES
EXTRACTED_DJANGO := $(EXTRACT_DIR)/django-partial.po
EXTRACTED_DJANGOJS := $(EXTRACT_DIR)/djangojs-partial.po
EXTRACTED_TEXT := $(EXTRACT_DIR)/text.po
JS_TARGET := public/js/translations
JS_TARGET := $(PACKAGE_NAME)/public/js/translations
TRANSLATIONS_DIR := $(PACKAGE_NAME)/translations

help:
Expand Down Expand Up @@ -76,8 +76,8 @@ extract_translations: symlink_translations ## extract strings to be translated,
if [ -f "$(EXTRACTED_DJANGOJS)" ]; then cat $(EXTRACTED_DJANGOJS) >> $(EXTRACTED_TEXT); rm $(EXTRACTED_DJANGOJS); fi

compile_translations: symlink_translations ## compile translation files, outputting .mo files for each supported language
cd $(PACKAGE_NAME) && i18n_tool generate
python manage.py compilejsi18n --namespace $(PACKAGE_NAME)i18n --output $(JS_TARGET)
cd $(PACKAGE_NAME) && i18n_tool generate -v
python manage.py compilejsi18n --namespace MindMapI18N --output $(JS_TARGET)

detect_changed_source_translations:
cd $(PACKAGE_NAME) && i18n_tool changed
Expand Down
111 changes: 68 additions & 43 deletions mindmap/locale/en/LC_MESSAGES/text.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-08 13:11-0500\n"
"POT-Creation-Date: 2023-09-18 11:39-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Bryann Valderrama <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -22,7 +22,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: mindmap.py:41 static/html/mindmap_edit.html:7
#: mindmap.py:41 public/html/mindmap_edit.html:7
msgid "Display name"
msgstr ""

Expand All @@ -33,7 +33,7 @@ msgid ""
"static, the students can create their own mind maps."
msgstr ""

#: mindmap.py:52 static/html/mindmap_edit.html:30
#: mindmap.py:52 public/html/mindmap_edit.html:30
msgid "Is a static mindmap?"
msgstr ""

Expand Down Expand Up @@ -83,138 +83,163 @@ msgstr ""
msgid "Whether the student has submitted their submission."
msgstr ""

#: mindmap.py:677
msgid "Dummy"
msgstr ""

#: static/html/mindmap.html:8
#: public/html/mindmap.html:8
msgid "Instructions for use"
msgstr ""

#: static/html/mindmap.html:10
#: public/html/mindmap.html:10
msgid "With the mouse"
msgstr ""

#: static/html/mindmap.html:13
#: public/html/mindmap.html:13
msgid "→ Double-click the node to edit it."
msgstr ""

#: static/html/mindmap.html:16
#: public/html/mindmap.html:16
msgid "→ Drag the node to move it."
msgstr ""

#: static/html/mindmap.html:19
#: public/html/mindmap.html:19
msgid "→ Click the circle to expand or collapse the child nodes."
msgstr ""

#: static/html/mindmap.html:23
#: public/html/mindmap.html:23
msgid "With the keyboard"
msgstr ""

#: static/html/mindmap.html:26
#: public/html/mindmap.html:26
msgid "→ Ctrl + Enter: Create a new child node for the selected node."
msgstr ""

#: static/html/mindmap.html:29
#: public/html/mindmap.html:29
msgid "→ Enter: Create a new brother node for the selected node."
msgstr ""

#: static/html/mindmap.html:32
#: public/html/mindmap.html:32
msgid "→ F2: Edit the selected node."
msgstr ""

#: static/html/mindmap.html:35
#: public/html/mindmap.html:35
msgid "→ Delete/Supr: Delete the selected node."
msgstr ""

#: static/html/mindmap.html:38
#: public/html/mindmap.html:38
msgid "→ Space: Expand or collapse the selected node."
msgstr ""

#: static/html/mindmap.html:57
#: public/html/mindmap.html:57
msgid "Save assignment"
msgstr ""

#: static/html/mindmap.html:58
#: public/html/mindmap.html:58
#: public/js/src/mindmap.js:159
msgid "Submit"
msgstr ""

#: static/html/mindmap.html:62
#: public/html/mindmap.html:62
msgid "Your score is:"
msgstr ""

#: static/html/mindmap.html:66
#: public/html/mindmap.html:66
msgid "Grade submissions"
msgstr ""

#: static/html/mindmap_edit.html:14
#: public/html/mindmap_edit.html:14
msgid "Weight"
msgstr ""

#: static/html/mindmap_edit.html:22
#: public/html/mindmap_edit.html:22
msgid "Points"
msgstr ""

#: static/html/mindmap_edit.html:32
#: public/html/mindmap_edit.html:32
msgid "True"
msgstr ""

#: static/html/mindmap_edit.html:33
#: public/html/mindmap_edit.html:33
msgid "False"
msgstr ""

#: static/html/mindmap_edit.html:41
#: public/html/mindmap_edit.html:41
msgid "Mind map"
msgstr ""

#: static/html/mindmap_edit.html:52
#: public/html/mindmap_edit.html:52
msgid "Save"
msgstr ""

#: static/html/mindmap_edit.html:55
#: public/html/mindmap_edit.html:55
msgid "Cancel"
msgstr ""

#: static/js/src/mindmap.js:93
#: public/js/src/mindmap.js:89
msgid "Username"
msgstr ""

#: public/js/src/mindmap.js:84
msgid "Uploaded"
msgstr ""

#: public/js/src/mindmap.js:85 public/js/src/mindmap.js:165
msgid "Grade"
msgstr ""

#: public/js/src/mindmap.js:86
msgid "Actions"
msgstr ""

#: public/js/src/mindmap.js:108
msgid "Mindmap submissions"
msgstr ""

#: static/js/src/mindmap.js:94
#: public/js/src/mindmap.js:109
msgid "Review"
msgstr ""

#: static/js/src/mindmap.js:95
#: public/js/src/mindmap.js:110
msgid "Search"
msgstr ""

#: static/js/src/mindmap.js:96
#: public/js/src/mindmap.js:111
msgid "Showing _START_ to _END_ of _TOTAL_ entries"
msgstr ""

#: static/js/src/mindmap.js:139
#: public/js/src/mindmap.js:112
msgid "No data available in table"
msgstr ""

#: public/js/src/mindmap.js:113
msgid "Showing 0 to 0 of 0 entries"
msgstr ""

#: public/js/src/mindmap.js:114
msgid "No matching records found"
msgstr ""

#: public/js/src/mindmap.js:115
msgid "(filtered from _MAX_ total entries)"
msgstr ""

#: public/js/src/mindmap.js:162
msgid "Remove grade"
msgstr ""

#: static/js/src/mindmap.js:140
#: public/js/src/mindmap.js:163
msgid "Loading..."
msgstr ""

#: static/js/src/mindmap.js:141
#: public/js/src/mindmap.js:164
msgid "Back"
msgstr ""

#: static/js/src/mindmap.js:142
msgid "Grade"
msgstr ""

#: static/js/src/mindmap.js:163
#: public/js/src/mindmap.js:186
msgid "Reviewing Mindmap for student: "
msgstr ""

#: static/js/src/mindmap.js:207
#: public/js/src/mindmap.js:230
msgid "Invalid grade must be a number"
msgstr ""

#: static/js/src/mindmap.js:208
#: public/js/src/mindmap.js:231
msgid "Please enter a lower grade, maximum grade allowed is:"
msgstr ""
Binary file modified mindmap/locale/es_419/LC_MESSAGES/text.mo
View file
Open in desktop
Binary file not shown.
Loading