summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--helpcontent2/helpers/update_tree.pl21
-rwxr-xr-xhelpcontent2/source/auxiliary/bn/default.css4
-rw-r--r--helpcontent2/source/auxiliary/makefile.mk14
3 files changed, 22 insertions, 17 deletions
diff --git a/helpcontent2/helpers/update_tree.pl b/helpcontent2/helpers/update_tree.pl
index 71579750a..23795168c 100644
--- a/helpcontent2/helpers/update_tree.pl
+++ b/helpcontent2/helpers/update_tree.pl
@@ -73,7 +73,7 @@ if ( ! defined $prj ) {
($source_dir = $scriptname) =~ s/\/update_tree.pl/\/..\/source/;
($source_dir_xhp = $scriptname) =~ s/\/update_tree.pl/\/..\/source/;
- if ( defined $ENV{TRYSDF} && defined $ENV{LOCALIZESDF} )
+ if ( defined $ENV{TRYSDF} || defined $ENV{LOCALIZESDF} )
{
if( defined $ENV{LOCALIZATION_FOUND} && $ENV{LOCALIZATION_FOUND} eq "YES" )
{
@@ -98,19 +98,16 @@ if ( ! defined $prj ) {
$source_dir_xhp = "$prj\/source";
$treestrings = "$source_dir/text/shared/tree_strings.xhp";
- if ( defined $ENV{TRYSDF} && defined $ENV{LOCALIZESDF} )
+ if( defined $ENV{LOCALIZATION_FOUND} && $ENV{LOCALIZATION_FOUND} eq "YES" )
{
- if( defined $ENV{LOCALIZATION_FOUND} && $ENV{LOCALIZATION_FOUND} eq "YES" )
- {
- $source_dir = $ENV{TRYSDF};
- }
- else
- {
- $source_dir = $ENV{LOCALIZESDF};
- }
- if( $is_win eq "false" ) { $source_dir =~ s/\/auxiliary\/localize.sdf$// ; }
- else { $source_dir =~ s/\\auxiliary\\localize.sdf$// ; }
+ $source_dir = $ENV{TRYSDF};
+ }
+ else
+ {
+ $source_dir = $ENV{LOCALIZESDF};
}
+ if( $is_win eq "false" ) { $source_dir =~ s/\/auxiliary\/localize.sdf$// ; }
+ else { $source_dir =~ s/\\auxiliary\\localize.sdf$// ; }
#else {die "ERROR: The env variables TRYSDF LOCALIZATION_FOUND LOCALIZESDF not found ... something is wrong!\n";}
}
diff --git a/helpcontent2/source/auxiliary/bn/default.css b/helpcontent2/source/auxiliary/bn/default.css
index 2fa534688..16b38e688 100755
--- a/helpcontent2/source/auxiliary/bn/default.css
+++ b/helpcontent2/source/auxiliary/bn/default.css
@@ -10,10 +10,10 @@
body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
- { font-family: "Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
+ { font-family: Mukti,MuktiNarrow,SolaimanLipi,"Lohit Bengali",Vrinda,"Bitstream Vera Sans",Arial,Helvetica,Lucida,Geneva,Helmet,sans-serif,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Tahoma; }
.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
- { font-family: "Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+ { font-family: Mukti,MuktiNarrow,SolaimanLipi,"Lohit Bengali",Vrinda,"Bitstream Vera Sans Mono",Cumberland,"Courier New",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
.acronym
{ font-weight: bold; }
diff --git a/helpcontent2/source/auxiliary/makefile.mk b/helpcontent2/source/auxiliary/makefile.mk
index 5f4369adb..1155e8036 100644
--- a/helpcontent2/source/auxiliary/makefile.mk
+++ b/helpcontent2/source/auxiliary/makefile.mk
@@ -68,9 +68,17 @@ $(LOCTREEFILES) : $(TREEFILES) $$(@:d)$/dir.created
@$(TOUCH) $@
.IF "$(WITH_LANG)"!=""
-#$(LOCTREEFILES) : $(PRJ)$/source$/text$/shared$/localize.sdf
-$(LOCTREEFILES) : $(LOCALIZESDF:d:d:d:d)$/text$/shared/localize.sdf
-$(LOCALIZESDF:d:d:d:d)$/text$/shared/localize.sdf : $(LOCALIZESDF)
+.IF "$(LOCALIZATION_FOUND)"=="YES"
+$(LOCTREEFILES) : $(TRYSDF:d:d:d:d)$/text$/shared/localize.sdf
+.ELSE # "$(LOCALIZATION_FOUND)"=="YES"
+$(COMMONMISC)/unpack.done : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip
+ @@-$(MKDIRHIER) $(COMMONMISC)$/$(PRJNAME)_$(TARGET)
+ unzip -o -d $(COMMONMISC)$/$(PRJNAME) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip
+ $(TOUCH) $@
+
+$(LOCTREEFILES) : $(COMMONMISC)/unpack.done
+
+.ENDIF # "$(LOCALIZATION_FOUND)"=="YES"
.ENDIF # "$(WITH_LANG)"!=""
aux_dirs .PHONY :