l10ntools/source/po.cxx | 2 +-
solenv/gbuild/ExtensionTarget.mk | 8 ++++----
solenv/gbuild/InstallModuleTarget.mk | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 0359041aac89ef07325f6b8baa2d5ff304e833b5
Author: Zolnai Tamás <zolnaitamas2...@gmail.com>
Date: Sun Sep 30 17:54:37 2012 +0200
Corrections for merge
-Correct po type-checking
-Use new "lang" variable instead of
nonexistent one
-Add input parameter to ulfex
Change-Id: I1dc17363179d69d40144b6a998eb1bf223bd05e9
Reviewed-on: https://gerrit.libreoffice.org/736
Reviewed-by: Andras Timar <ati...@suse.com>
Tested-by: Andras Timar <ati...@suse.com>
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index f929ce7..b9e1c17 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -481,7 +481,7 @@ OString PoEntry::getResourceType() const
PoEntry::TYPE PoEntry::getType() const
{
const OString sContext = m_aGenPo.getContext();
- const OString sType = sContext.copy( sContext.indexOf('.') + 1 );
+ const OString sType = sContext.copy( sContext.lastIndexOf('.') + 1 );
assert( m_bIsInitialized &&
(sType == "text" || sType == "quickhelptext" || sType == "title") );
if ( sType == "text" )
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index 559e0cf..4e53be5 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -136,9 +136,9 @@ $(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME :=
$(firstword $(subst /, ,
$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml :
$(SRCDIR)/$(2)/description.xml
ifneq ($(strip $(gb_WITH_LANG)),)
$(call gb_ExtensionTarget_get_target,$(1)) : \
- POFILES := $(foreach
lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
+ POFILES := $(foreach
lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \
- $(foreach
lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
+ $(foreach
lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
endif
$(foreach lang,$(gb_ExtensionTarget_ALL_LANGS), \
@@ -225,9 +225,9 @@ $(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(2)
ifneq ($(strip $(gb_WITH_LANG)),)
$(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(foreach lang,$(subst
-,_,$(gb_ExtensionTarget_TRANS_LANGS)),$(subst en_US,$(lang),$(2)))
$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \
- POFILES := $(foreach
lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst
/%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po)
+ POFILES := $(foreach
lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst
/%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po)
$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : \
- $(foreach
lang,$(gb_ExtensionTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst
/%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po)
+ $(foreach
lang,$(gb_ExtensionTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst
/%/,%,$(subst $(SRCDIR),,$(dir $(3)))).po)
endif
$(call gb_ExtensionTarget_get_target,$(1)) : $(call
gb_ExtensionTarget_get_rootdir,$(1))/$(2)
$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(3) \
diff --git a/solenv/gbuild/InstallModuleTarget.mk
b/solenv/gbuild/InstallModuleTarget.mk
index ace8ceb..242a259 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -132,7 +132,7 @@ $(dir $(call gb_ScpMergeTarget_get_target,%))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(call gb_ScpMergeTarget_get_target,%) : $(gb_ScpMergeTarget_TARGET)
- $(call gb_ScpMergeTarget__command,$@,$*)
+ $(call gb_ScpMergeTarget__command,$@,$*,$(SCP_SOURCE))
.PHONY : $(call gb_ScpMergeTarget_get_clean_target,%)
$(call gb_ScpMergeTarget_get_clean_target,%) :
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
