You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2019/06/18 10:50:08 UTC
svn commit: r1861567 - in /openoffice/trunk/main:
dbaccess/AllLangResTarget_dbui.mk solenv/gbuild/AllLangResTarget.mk
Author: mseidel
Date: Tue Jun 18 10:50:07 2019
New Revision: 1861567
URL: http://svn.apache.org/viewvc?rev=1861567&view=rev
Log:
i128128 - Lost translations in database wizard
Fixing double slash and wrong paths
Modified:
openoffice/trunk/main/dbaccess/AllLangResTarget_dbui.mk
openoffice/trunk/main/solenv/gbuild/AllLangResTarget.mk
Modified: openoffice/trunk/main/dbaccess/AllLangResTarget_dbui.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/AllLangResTarget_dbui.mk?rev=1861567&r1=1861566&r2=1861567&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/AllLangResTarget_dbui.mk (original)
+++ openoffice/trunk/main/dbaccess/AllLangResTarget_dbui.mk Tue Jun 18 10:50:07 2019
@@ -126,7 +126,7 @@ $(WORKDIR)/inc/dbaccess/AutoControls.hrc
$(call gb_Helper_abbreviate_dirs_native, \
$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
-p svx \
- -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/inc/localize.sdf -l all)
+ -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/source/ui/dlg/localize.sdf -l all)
$(WORKDIR)/inc/dbaccess/toolbox.hrc : $(SRCDIR)/dbaccess/source/ui/inc/toolbox_tmpl.hrc $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf
echo merging $@
@@ -136,7 +136,7 @@ $(WORKDIR)/inc/dbaccess/toolbox.hrc : $(
$(call gb_Helper_abbreviate_dirs_native, \
$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
-p svx \
- -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/inc/localize.sdf -l all)
+ -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/source/ui/inc/localize.sdf -l all)
endif
Modified: openoffice/trunk/main/solenv/gbuild/AllLangResTarget.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/AllLangResTarget.mk?rev=1861567&r1=1861566&r2=1861567&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/AllLangResTarget.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/AllLangResTarget.mk Tue Jun 18 10:50:07 2019
@@ -27,7 +27,7 @@ gb_SrsPartMergeTarget_TRANSEXTARGET := $
# gb_SrsPartMergeTarget_TRANSEXPRECOMMAND is set by the platforms
gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
-gb_SrsPartMergeTarget_SDFLOCATION := $(LOCDIR)/l10n/$(INPATH)/misc/sdf/
+gb_SrsPartMergeTarget_SDFLOCATION := $(LOCDIR)/l10n/$(INPATH)/misc/sdf
gb_SrsPartMergeTarget_REPOS := $(gb_REPOS)
define gb_SrsPartMergeTarget__command
@@ -102,8 +102,8 @@ $(call gb_SrsPartTarget_get_target,$(1))
else
$(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call gb_SrsPartMergeTarget_get_target,$(1))
$(call gb_SrsPartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_get_target,$(1))
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)/$(dir $(1))localize.sdf)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)/$(dir $(1))localize.sdf)
endif
endef