diff options
| author | Andras Timar <atimar@suse.com> | 2011-10-30 22:56:43 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2011-10-30 22:56:43 +0100 |
| commit | a18bfb0830796fbbb2f2699e9213d29045a7ef19 (patch) | |
| tree | bfc0391e299e8fe01549cdda979eb4ed9d4730bb /sdext/source/presenter | |
| parent | 9ab6ecf33192750cc0353aa806e8ca2479f09224 (diff) | |
Revert "enable localization of extension descriptions in sdext"
This reverts commit 184653370717f99e0cce817822caecde01d20006.
Diffstat (limited to 'sdext/source/presenter')
| -rw-r--r-- | sdext/source/presenter/description.xml | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | sdext/source/presenter/help/component.txt (renamed from sdext/source/presenter/description-en-US.txt) | 0 | ||||
| -rw-r--r-- | sdext/source/presenter/makefile.mk | 16 |
3 files changed, 8 insertions, 10 deletions
diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml index 22e51199bf09..bf9ce7260751 100644 --- a/sdext/source/presenter/description.xml +++ b/sdext/source/presenter/description.xml @@ -28,7 +28,7 @@ </icon> <extension-description> - <src xlink:href="description-en-US.txt" lang="en-US" /> + <src xlink:href="help/component.txt" lang="en-US" /> </extension-description> </description> diff --git a/sdext/source/presenter/description-en-US.txt b/sdext/source/presenter/help/component.txt index 26a10c622fe9..26a10c622fe9 100644..100755 --- a/sdext/source/presenter/description-en-US.txt +++ b/sdext/source/presenter/help/component.txt diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index edf39197c6a9..1afbb1e68093 100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -247,11 +247,9 @@ COMPONENT_LIBRARY= \ PLATFORMID:=$(RTL_OS:l)_$(RTL_ARCH:l) COMPONENT_HELP= \ + $(ZIP1DIR)$/help/component.txt \ $(foreach,l,$(alllangiso) $(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp) -COMPONENT_DESCRIPTION= \ - $(foreach,lang,$(alllangiso) $(ZIP1DIR)$/description-$(lang).txt) - ZIP1DEPS= \ $(DESCRIPTION) \ $(COMPONENT_MANIFEST) \ @@ -259,7 +257,6 @@ ZIP1DEPS= \ $(COMPONENT_BITMAPS) \ $(COMPONENT_IMAGES) \ $(COMPONENT_LIBRARY) \ - $(COMPONENT_DESCRIPTION) \ $(COMPONENT_HELP) LINKNAME:=help @@ -287,6 +284,10 @@ $(COMPONENT_MANIFEST) : $$(@:f) @-$(MKDIRHIER) $(@:d) +$(TYPE) $< | $(SED) "s/SHARED_EXTENSION/$(DLLPOST)/" > $@ +$(ZIP1DIR)$/help$/component.txt : help$/$$(@:f) + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + $(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : $(COMMONMISC)$/%$/com.sun.PresenterScreen$/presenter.xhp @echo creating $@ @-$(MKDIRHIER) $(@:d) @@ -350,7 +351,7 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f) .ENDIF #"$(COM)"=="GCC" .ENDIF #"$(OS)$(CPU)"=="WNTI" && "$(WITH_EXTENSION_INTEGRATION)"!="YES" -$(COMPONENT_DESCRIPTION) : $(DESCRIPTION) + $(ZIP1DIR)/%.xcu : %.xcu @@-$(MKDIRHIER) $(@:d) @@ -367,10 +368,7 @@ PHONYDESC=.PHONY $(DESCRIPTION) $(PHONYDESC) : $$(@:f) @-$(MKDIRHIER) $(@:d) @echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk - $(GNUCOPY) description-en-US.txt $(ZIP1DIR)/description-en-US.txt - $(XRMEX) -p $(PRJNAME) -i description.xml -o $@ -m $(LOCALIZESDF) -l all - $(TYPE) $@ | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@.new - mv $@.new $@ + $(TYPE) description.xml | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@ ALLTAR: $(MISC)/../bin/presenter-screen.oxt # hotfix to missing localizations |