Use Django's Javascript translation catalog #713

courtneycb · 2018-09-13T01:44:33Z

This PR enables the use of Django's JavaScript translation catalog, meaning we can now use gettext() to translate text in JavaScript files.

It also uses django-statici18n, a Django app that collects JavaScript catalogs into a single location. (Instead of generating it dynamically on each request).

Todo:

Documentation

JackMorganNZ · 2018-09-13T02:02:52Z

csfieldguide/config/urls.py

@@ -16,6 +17,7 @@
    url(r"^chapters/", include("chapters.urls", namespace="chapters")),
    url(r"^appendices/", include("appendices.urls", namespace="appendices")),
    url(r"^search/", include("search.urls", namespace="search")),
+    url(r"^jsi18n/$", JavaScriptCatalog.as_view(), name="javascript-catalog"),


This might not be required, worth checking.

codecov · 2018-09-13T02:15:13Z

Codecov Report

Merging #713 into develop will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           develop     #713   +/-   ##
========================================
  Coverage    98.01%   98.01%           
========================================
  Files           59       59           
  Lines          858      858           
  Branches        67       67           
========================================
  Hits           841      841           
  Misses          13       13           
  Partials         4        4

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 64c80df...2de89d9. Read the comment docs.

codecov · 2018-09-18T22:02:38Z

Codecov Report

Merging #713 into develop will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           develop     #713   +/-   ##
========================================
  Coverage    98.01%   98.01%           
========================================
  Files           59       59           
  Lines          858      858           
  Branches        67       67           
========================================
  Hits           841      841           
  Misses          13       13           
  Partials         4        4

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 96756f8...dc6fcbe. Read the comment docs.

codecov · 2018-09-18T22:11:46Z

Codecov Report

Merging #713 into develop will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           develop     #713   +/-   ##
========================================
  Coverage    98.01%   98.01%           
========================================
  Files           59       59           
  Lines          858      858           
  Branches        67       67           
========================================
  Hits           841      841           
  Misses          13       13           
  Partials         4        4

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 96756f8...f0877ef. Read the comment docs.

codecov · 2018-09-18T22:24:50Z

Codecov Report

Merging #713 into develop will decrease coverage by 2.11%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           develop    #713      +/-   ##
==========================================
- Coverage    98.01%   95.9%   -2.12%     
==========================================
  Files           59      56       -3     
  Lines          858     806      -52     
  Branches        67      61       -6     
==========================================
- Hits           841     773      -68     
- Misses          13      29      +16     
  Partials         4       4

Impacted Files	Coverage Δ
csfieldguide/utils/LoaderFactory.py	`0% <0%> (-100%)`	⬇️
...guide/chapters/management/commands/loadchapters.py
...teractives/management/commands/loadinteractives.py
...eldguide/general/management/commands/updatedata.py

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 96756f8...f0877ef. Read the comment docs.

codecov · 2018-09-18T22:25:33Z

Codecov Report

Merging #713 into develop will decrease coverage by 2.11%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           develop    #713      +/-   ##
==========================================
- Coverage    98.01%   95.9%   -2.12%     
==========================================
  Files           59      56       -3     
  Lines          858     806      -52     
  Branches        67      61       -6     
==========================================
- Hits           841     773      -68     
- Misses          13      29      +16     
  Partials         4       4

Impacted Files	Coverage Δ
csfieldguide/utils/LoaderFactory.py	`0% <0%> (-100%)`	⬇️
...guide/chapters/management/commands/loadchapters.py
...teractives/management/commands/loadinteractives.py
...eldguide/general/management/commands/updatedata.py

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 96756f8...f0877ef. Read the comment docs.

codecov · 2018-09-18T22:25:47Z

Codecov Report

Merging #713 into develop will decrease coverage by 2.11%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           develop    #713      +/-   ##
==========================================
- Coverage    98.01%   95.9%   -2.12%     
==========================================
  Files           59      56       -3     
  Lines          858     806      -52     
  Branches        67      61       -6     
==========================================
- Hits           841     773      -68     
- Misses          13      29      +16     
  Partials         4       4

Impacted Files	Coverage Δ
csfieldguide/utils/LoaderFactory.py	`0% <0%> (-100%)`	⬇️
...guide/chapters/management/commands/loadchapters.py
...teractives/management/commands/loadinteractives.py
...eldguide/general/management/commands/updatedata.py

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 96756f8...f0877ef. Read the comment docs.

codecov · 2018-09-18T22:27:08Z

Codecov Report

Merging #713 into develop will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           develop     #713   +/-   ##
========================================
  Coverage    98.01%   98.01%           
========================================
  Files           59       59           
  Lines          858      858           
  Branches        67       67           
========================================
  Hits           841      841           
  Misses          13       13           
  Partials         4        4

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 96756f8...f0877ef. Read the comment docs.

codecov · 2018-09-18T22:39:43Z

Codecov Report

Merging #713 into develop will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           develop     #713   +/-   ##
========================================
  Coverage    98.01%   98.01%           
========================================
  Files           59       59           
  Lines          858      858           
  Branches        67       67           
========================================
  Hits           841      841           
  Misses          13       13           
  Partials         4        4

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 96756f8...f0877ef. Read the comment docs.

codecov · 2018-09-18T22:41:52Z

Codecov Report

Merging #713 into develop will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           develop     #713   +/-   ##
========================================
  Coverage    98.01%   98.01%           
========================================
  Files           59       59           
  Lines          858      858           
  Branches        67       67           
========================================
  Hits           841      841           
  Misses          13       13           
  Partials         4        4

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 96756f8...f0877ef. Read the comment docs.

codecov · 2018-09-18T22:41:57Z

Codecov Report

Merging #713 into develop will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           develop     #713   +/-   ##
========================================
  Coverage    98.01%   98.01%           
========================================
  Files           59       59           
  Lines          858      858           
  Branches        67       67           
========================================
  Hits           841      841           
  Misses          13       13           
  Partials         4        4

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 96756f8...f0877ef. Read the comment docs.

codecov · 2018-09-18T22:42:03Z

Codecov Report

Merging #713 into develop will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           develop     #713   +/-   ##
========================================
  Coverage    98.01%   98.01%           
========================================
  Files           59       59           
  Lines          858      858           
  Branches        67       67           
========================================
  Hits           841      841           
  Misses          13       13           
  Partials         4        4

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 96756f8...f0877ef. Read the comment docs.

courtneycb added 11 commits September 11, 2018 13:06

Merge branch 'develop' into javascript-translation-catalog

2c58654

Use django-statici18n for translations in javascript.

975b926

Fix JavaScript translations for no-help.

c64d99c

Merge branch 'develop' into javascript-translation-catalog

2cc49b0

Fix translations in JavaScript for big-number-calculator.

0c75d28

Fix JavaScript translations for binary-cards.

ad42817

Write catalog file to build folder. Fix translations in binary-cards.

629d027

Fix javascript translations for close-window.

3b26da7

Fix javascript translations for colour-matcher.

ed3891f

Fix js translations for deceiver interactive.

ac3e276

Merge branch 'develop' into javascript-translation-catalog

4298727

courtneycb added internationalization backend labels Sep 13, 2018

courtneycb added this to the 3.0.0 - Django System milestone Sep 13, 2018

courtneycb requested a review from JackMorganNZ September 13, 2018 01:44

Add newline at EOF.

624aad1

JackMorganNZ requested changes Sep 13, 2018

View reviewed changes

Update docs.

bfe0397

courtneycb changed the title ~~(WIP) Use Django's Javascript translation catalog~~ Use Django's Javascript translation catalog Sep 13, 2018

courtneycb added 10 commits September 13, 2018 14:25

Review changes.

0b2f9d5

Merge branch 'develop' into javascript-translation-catalog

2de89d9

Merge branch 'develop' into javascript-translation-catalog

f4a64d3

Use javascript catalog in delay-analyser.

9750e6a

Use javascript catalog in hex-background-colour

976816a

Use javascript catalog in high-score-boxes.

3f2c427

Use javascript catalog in image-bit-comparer.

7370d9e

Formatting.

5f61bff

formatting

1a151d7

Use javascript catalog in nfa-guesser

44e2241

courtneycb added 8 commits September 18, 2018 13:06

Use javascript catalog in payment-interface.

3fc52ee

Use javascript catalog in python-interpreter.

9b1269c

Use javascript catalog in rsa-jsencrypt.

b41461f

Use javascript catalog in rsa-no-padding.

7dc7988

Use javascript catalog in run-length-encoding.

2811036

Use javascript catalog in unicode-length.

878d290

Naming consistency.

63a84de

Add missing bracket.

dc6fcbe

makemessages.

f0877ef

JackMorganNZ approved these changes Sep 21, 2018

View reviewed changes

JackMorganNZ merged commit f0877ef into develop Sep 21, 2018

JackMorganNZ deleted the javascript-translation-catalog branch September 21, 2018 09:48

courtneycb mentioned this pull request Aug 7, 2020

Use Django's JavaScript Catalog uccser/cs-unplugged#1409

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use Django's Javascript translation catalog #713

Use Django's Javascript translation catalog #713

courtneycb commented Sep 13, 2018 •

edited

Loading

JackMorganNZ Sep 13, 2018

codecov bot commented Sep 13, 2018 •

edited

Loading

codecov bot commented Sep 18, 2018

codecov bot commented Sep 18, 2018

codecov bot commented Sep 18, 2018

codecov bot commented Sep 18, 2018

codecov bot commented Sep 18, 2018

codecov bot commented Sep 18, 2018

codecov bot commented Sep 18, 2018

codecov bot commented Sep 18, 2018

codecov bot commented Sep 18, 2018

codecov bot commented Sep 18, 2018

Use Django's Javascript translation catalog #713

Use Django's Javascript translation catalog #713

Conversation

courtneycb commented Sep 13, 2018 • edited Loading

JackMorganNZ Sep 13, 2018

Choose a reason for hiding this comment

codecov bot commented Sep 13, 2018 • edited Loading

Codecov Report

codecov bot commented Sep 18, 2018

Codecov Report

codecov bot commented Sep 18, 2018

Codecov Report

codecov bot commented Sep 18, 2018

Codecov Report

codecov bot commented Sep 18, 2018

Codecov Report

codecov bot commented Sep 18, 2018

Codecov Report

codecov bot commented Sep 18, 2018

Codecov Report

codecov bot commented Sep 18, 2018

Codecov Report

codecov bot commented Sep 18, 2018

Codecov Report

codecov bot commented Sep 18, 2018

Codecov Report

codecov bot commented Sep 18, 2018

Codecov Report

courtneycb commented Sep 13, 2018 •

edited

Loading

codecov bot commented Sep 13, 2018 •

edited

Loading