* Bug #13516 fixed - Russian and Japanese help pages were missing.

Export LC_ALL env variable to match language on doc generation.

Change-Id: Ie47a4926ea8b3b7d3cef4b95759e3fa523d758e7

diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X
index d721d8f..fb3bffa 100644 (file)
--- a/scilab/CHANGES_5.5.X
+++ b/scilab/CHANGES_5.5.X
@@ -225,6 +225,8 @@ Scilab Bug Fixes
 
 * Bug #13515 fixed - There were wrong results for matrix/hypermatrix with bitset.
 
+* Bug #13516 fixed - Russian and Japanese help pages were missing.
+
 * Bug #13524 fixed - strtod did not ignore the tabs and CR.
 
 * Bug #13527 fixed - hilb did not check properly the type of the first input argument.

diff --git a/scilab/Makefile.am b/scilab/Makefile.am
index 06d3d44..8c79abe 100644 (file)
--- a/scilab/Makefile.am
+++ b/scilab/Makefile.am
@@ -255,8 +255,8 @@ if BUILD_HELP
                for l in $(ALL_LINGUAS_DOC); do \
                        echo "-- Building documentation ($$l) --"; \
                        COMMAND="try xmltojar([],[],'$$l');catch disp(lasterror()); exit(-1);end;exit(0);"; \
-                       echo "LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -nouserstartup -e \"$$COMMAND\"";\
-                       LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e "$$COMMAND" || exit 1;\
+                       echo "LANG=C LC_ALL=$$l.UTF-8 SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e \"$$COMMAND\"";\
+                       LANG=C LC_ALL=$$l.UTF-8 SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e "$$COMMAND" || exit 1;\
                done; \
        else \
                echo "Cannot find Scilab-adv-cli binary"; \

diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index b452df2..51f373d 100644 (file)
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -2145,8 +2145,8 @@ doc: javadoc $(top_builddir)/scilab-bin $(top_builddir)/bin/scilab-adv-cli
 @BUILD_HELP_TRUE@              for l in $(ALL_LINGUAS_DOC); do \
 @BUILD_HELP_TRUE@                      echo "-- Building documentation ($$l) --"; \
 @BUILD_HELP_TRUE@                      COMMAND="try xmltojar([],[],'$$l');catch disp(lasterror()); exit(-1);end;exit(0);"; \
-@BUILD_HELP_TRUE@                      echo "LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -nouserstartup -e \"$$COMMAND\"";\
-@BUILD_HELP_TRUE@                      LANG=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e "$$COMMAND" || exit 1;\
+@BUILD_HELP_TRUE@                      echo "LANG=C LC_ALL=$$l.UTF-8 SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e \"$$COMMAND\"";\
+@BUILD_HELP_TRUE@                      LANG=C LC_ALL=$$l.UTF-8 SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e "$$COMMAND" || exit 1;\
 @BUILD_HELP_TRUE@              done; \
 @BUILD_HELP_TRUE@      else \
 @BUILD_HELP_TRUE@              echo "Cannot find Scilab-adv-cli binary"; \