fix(i18n): fix escaping issue in i18n

Makefile

@@ -35,17 +35,22 @@ static/dune:
 # Generates up-to-date translation template for lang % from the sources
 LANGS = $(patsubst translations/%.po,%,$(wildcard translations/*.po))
 translations/$(LANGS:=.pot):
-	@for f in $(LANGS); do echo >> translations/$$f.po; done
-	@rm -f translations/*.pot
+	@for f in $(LANGS); do \
+	  echo >> translations/$$f.po; \
+	  rm -f translations/$$f.pot; \
+	  cp translations/$$f.po.header translations/$$f.pot; \
+	 done
 	@${DUNE} clean ${DUNE_ARGS}
 	-rm -f ${INDEX_ODOC_PATH}
 	@DUMP_POT=1 ${DUNE} build ${DUNE_ARGS} -j 1
 	@for f in $(LANGS); do \
 	  mv translations/$$f.pot translations/$$f.pot.bak; \
-	  msguniq translations/$$f.pot.bak > translations/$$f.pot; \
-	  rm translations/$$f.pot.bak; \
+	  msguniq -t utf-8 translations/$$f.pot.bak > translations/$$f.pot \
+	  && rm translations/$$f.pot.bak; \
 	done
 
+.PHONY: translations/$(LANGS:=.pot)
+
 # Updates existing translations (.po) for the latest source template
 update-%-translation: translations/%.pot
 	@msgmerge -U translations/$*.po translations/$*.pot

src/app/learnocaml_teacher_tab_doc.ml

@@ -27,7 +27,7 @@ let exercises_pane_md =
   Those can also be pre-defined in the exercises metadata.
   1. Select the exercises to tag
   2. Select or type a new tag in one of the boxes on the lower-right of the pane
-     (left for requirements, right skills trained by the exercise)
+     (left for requirements, right for skills trained by the exercise)
   3. Click the corresponding [+] button to add the tag ([-] to remove)
 
 - **Checking an exercise contents**

src/utils/dune

@@ -21,7 +21,7 @@
  (wrapped false)
  (flags :standard -warn-error -4-42-44-45-48)
  (kind ppx_rewriter)
- (libraries ocaml-migrate-parsetree)
+ (libraries ocaml-migrate-parsetree re)
  (modules Ppx_ocplib_i18n)
 )
 

src/utils/ppx_ocplib_i18n.ml

@@ -103,7 +103,11 @@ let dump_pot () =
               Format.pp_print_char fmt ' ';
               Location.print_loc fmt l)
             locs;
-          Format.fprintf fmt "\nmsgid %S\n" s;
+          Format.fprintf fmt "\nmsgid \"%s\"\n"
+            Re.(s |>
+                replace_string (compile (char '\\')) ~by:"\\\\" |>
+                replace_string (compile (char '"')) ~by:"\\\"" |>
+                replace_string (compile (char '\n')) ~by:"\\n");
           Format.fprintf fmt "msgstr \"\"\n\n";
         ) misses;
       close_out oc