[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                               |    2 +
 patches/dev300/layout-generate-localize-sdf-2.diff |   34 +++++++++++++++++++++
 2 files changed, 36 insertions(+)

New commits:
commit 6836e55cddeb879c9eddafd4d926976801c7f23f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Nov 23 20:52:30 2010 +0100

    layouted zoom dialog was not localized (bnc#595823)
    
    the localized strings were searched in wrong file
    
    ported from the ooo-build-3-2-1 branch

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ff06d2e..6f38f2f 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1682,6 +1682,8 @@ layout-disabled-layout-build-fix.diff, pmladek
 # FIXME: generates localize.sdf from the .zip files in solver
 # should replace layout-localize-fix-sc.diff
 layout-generate-localize-sdf.diff, deb#570378, pmladek
+# zoom dialog was not localized
+layout-generate-localize-sdf-2.diff, bnc#595823, pmladek
 
 [ UnitTesting ]
 SectionOwner => jholesov
diff --git a/patches/dev300/layout-generate-localize-sdf-2.diff b/patches/dev300/layout-generate-localize-sdf-2.diff
new file mode 100644
index 0000000..6e767a2
--- /dev/null
+++ b/patches/dev300/layout-generate-localize-sdf-2.diff
@@ -0,0 +1,34 @@
+--- svx/uiconfig/layout/makefile.mk.old	2010-11-10 20:50:39.000000000 +0100
++++ svx/uiconfig/layout/makefile.mk	2010-11-23 20:47:22.000000000 +0100
+@@ -47,9 +47,9 @@ all .PHONY:
+ 
+ .INCLUDE :  target.mk
+ 
+-localize.sdf: $(COMMONMISC)$/$(PRJNAME)$/source$/dialog$/localize.sdf
++localize.sdf: $(COMMONMISC)$/$(PRJNAME)$/source$/dialog$/localize.sdf $(COMMONMISC)$/$(PRJNAME)$/source$/cui$/localize.sdf
+     grep srchdlg.src $(COMMONMISC)$/$(PRJNAME)$/source$/dialog$/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\find-and-replace.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_SEARCH/\t/' -e 's/\t_label/\tRID_SVXDLG_SEARCH_title/' > find-and-replace-$@
+-    grep zoom.src $(COMMONMISC)$/$(PRJNAME)$/source$/dialog$/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\zoom.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_ZOOM/\t/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/' > zoom-$@
++    grep zoom.src $(COMMONMISC)$/$(PRJNAME)$/source$/cui$/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\zoom.xml", $$3, "layout", $$5 $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\tRID_SVXDLG_ZOOM/\t/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/' > zoom-$@
+     echo '#empty' | cat - find-and-replace-$@ zoom-$@ > $@
+     rm -f *-$@
+ 
+@@ -61,10 +61,19 @@ $(COMMONMISC)$/$(PRJNAME)$/source$/dialo
+     -unzip -o -d $(COMMONMISC)$/$(PRJNAME) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(subst,$(COMMONMISC)$/$(PRJNAME)$/, $@)
+     $(TOUCH) $@
+ 
++$(COMMONMISC)$/$(PRJNAME)$/source$/cui$/localize.sdf : $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip 
++    @@-$(MKDIRHIER) $(@:d) 
++    -unzip -o -d $(COMMONMISC)$/$(PRJNAME) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(subst,$(COMMONMISC)$/$(PRJNAME)$/, $@) 
++    $(TOUCH) $@ 
++
+ .ELSE
+ 
+ $(COMMONMISC)$/$(PRJNAME)$/source$/dialog$/localize.sdf :
+     @@-$(MKDIRHIER) $(@:d)
+     $(TOUCH) $@
+ 
++$(COMMONMISC)$/$(PRJNAME)$/source$/cui$/localize.sdf : 
++    @@-$(MKDIRHIER) $(@:d) 
++    $(TOUCH) $@ 
++
+ .ENDIF # "$(WITH_LANG)"!=""