[Libreoffice-commits] .: Branch 'libreoffice-4-0' - solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/UI.mk |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 69a4961fd70a54237c7848faba4d132a6a96ba36
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jan 7 10:08:21 2013 +0100

    deliver qtz translations for .ui files
    
    regression from 76091d814ca084ba66fcb9db8bc4565c47ee16a5
    
    Change-Id: I70c27cd3f72c453a1b4c2fb65b6172c8c251a741
    (cherry picked from commit 85e36d2baa54eb7b65cc680389eacb2b5884c100)
    
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk
index f6f4e00..62f7870 100644
--- a/solenv/gbuild/UI.mk
+++ b/solenv/gbuild/UI.mk
@@ -157,9 +157,10 @@ $(foreach lang,$(3),$(call gb_UI__add_uifile_for_lang,$(1),$(2),$(lang)))
 
 endef
 
-# gb_UI__add_translations target uifile langs
+# gb_UI__add_translations target uifile langs qtz
 define gb_UI__add_translations
-$(if $(strip $(3)),$(call gb_UI__add_translations_impl,$(1),$(2),$(3)))
+$(if $(strip $(3) $(4)),$(call gb_UI__add_translations_impl,$(1),$(2),$(3)))
+$(if $(strip $(4)),$(call gb_UI__add_uifile_for_lang,$(1),$(2),$(strip $(4))))
 
 endef
 
@@ -170,7 +171,8 @@ define gb_UI__add_uifile_translations
 $(call gb_UI__add_translations,$(1),$(2),\
 	$(foreach lang,$(gb_UI_LANGS),\
 		$(if $(wildcard $(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(2))).po),$(lang)) \
-	) \
+	),\
+	$(filter qtz,$(gb_UI_LANGS)) \
 )
 
 endef