Merge pull request #611 from ilankri/project-template-fixes

Project template fixes

Author: balat

opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "ocsigen-start"
-version: "2.20.0"
+version: "2.21.0"
 authors: "[email protected]"
 maintainer: "[email protected]"
 synopsis: "An Eliom application skeleton ready to use to build your own application with users, (pre)registration, notifications, etc"

template.distillery/Makefile.i18n

@@ -38,5 +38,10 @@ $(PROJECT_NAME)_%_i18n.eliom: $(I18N_TSV_DIR)$(PROJECT_NAME)_%_i18n.tsv
 i18n-check:
 	$(I18N_CHECKER) ./*.eliom < $(I18N_TSV_FILE)
 
+.PHONY: i18n-clean
+i18n-clean:
+	-rm -f $(notdir $(patsubst %.tsv,%.eliom,$(I18N_PRIMARY_FILE)	\
+						 $(I18N_EXTRA_FILES)))
+
 ## end of i18n
 ##----------------------------------------------------------------------

template.distillery/Makefile.os

@@ -341,7 +341,7 @@ $(DEPSDIR):
 ##----------------------------------------------------------------------
 ## Clean up
 
-clean:: clean-style mobile-clean
+clean:: clean-style mobile-clean i18n-clean
 	-rm -f *.cm[ioax] *.cmxa *.cmxs *.o *.a *.annot
 	-rm -f *.type_mli
 	-rm -rf ${ELIOM_CLIENT_DIR} ${ELIOM_SERVER_DIR}

template.distillery/demo_i18n.eliom

@@ -41,6 +41,6 @@ let%shared page () =
     ; p [txt [%i18n Demo.S.internationalization_3]]
     ; p
         [%i18n
-          Demo.S.internationalization_4
+          Demo.internationalization_4
             ~f:[code [txt "assets/%%%PROJECT_NAME%%%_Demo_i18n.tsv"]]
             ~demo_prefix:[code [txt "demo_"]]] ]