From 73cb0b803db1ccd841b4d43e2dcd1cc3ba8dd69a Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 20 Feb 2012 10:01:50 +0100 Subject: enable localization of Lightproof extensions (cherry picked from commit 312a744c1c8a4afce0fe06a4423d97ebb883fc6d) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Caolán McNamara --- dictionaries/en/makefile.mk | 19 ++++++++++++++++++- dictionaries/hu_HU/makefile.mk | 21 ++++++++++++++++++++- dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties | 15 --------------- dictionaries/ru_RU/makefile.mk | 20 ++++++++++++++++++-- 4 files changed, 56 insertions(+), 19 deletions(-) delete mode 100644 dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties diff --git a/dictionaries/en/makefile.mk b/dictionaries/en/makefile.mk index fc51ec1..ac9f7f6 100644 --- a/dictionaries/en/makefile.mk +++ b/dictionaries/en/makefile.mk @@ -88,7 +88,6 @@ COMPONENT_FILES= \ $(EXTENSIONDIR)$/dialog/en_en_US.default \ $(EXTENSIONDIR)$/dialog/en_en_US.properties \ $(EXTENSIONDIR)$/dialog/en.xdl \ - $(EXTENSIONDIR)$/dialog/OptionsDialog.xcu \ $(EXTENSIONDIR)$/dialog/OptionsDialog.xcs COMPONENT_CONFIGDEST=. @@ -103,6 +102,13 @@ PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE) COMPONENT_UNZIP_FILES= \ $(EXTENSIONDIR)$/th_en_US_v2.idx +.IF "$(WITH_LANG)" != "" +PROPERTIES_LOCALIZED:=$(MISC)/$(EXTENSIONNAME)_in/properties_localized +COMPONENT_UNZIP_FILES+=$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu $(PROPERTIES_LOCALIZED) +.ELSE +COMPONENT_FILES+=$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu +.ENDIF + # add own targets to packing dependencies (need to be done before # packing the xtension # EXTENSION_PACKDEPS=makefile.mk $(CUSTOM_LICENSE) @@ -123,4 +129,15 @@ $(EXTENSIONDIR)$/th_en_US_v2.idx : "$(EXTENSIONDIR)$/th_en_US_v2.dat" $(DESCRIPTION_SRC) : description.xml @@-$(MKDIRHIER) $(@:d) $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $< -o $@ -m $(LOCALIZESDF) -l all +$(EXTENSIONDIR)/dialog/OptionsDialog.xcu : dialog/OptionsDialog.xcu + $(COMMAND_ECHO)$(CFGEX) -p $(PRJNAME) \ + -i $< \ + -o $(EXTENSIONDIR)/dialog/OptionsDialog.xcu \ + -m $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/dictionaries/en/dialog/localize.sdf \ + -l all +$(PROPERTIES_LOCALIZED) : $(EXTENSIONDIR)/dialog/en_en_US.properties + $(COMMAND_ECHO)$(PERL) $(OUTDIR)/bin/propmerge \ + -i $< \ + -m $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/dictionaries/en/dialog/localize.sdf + @@-$(TOUCH) $(PROPERTIES_LOCALIZED) .ENDIF diff --git a/dictionaries/hu_HU/makefile.mk b/dictionaries/hu_HU/makefile.mk index 67916e4..998f692 100644 --- a/dictionaries/hu_HU/makefile.mk +++ b/dictionaries/hu_HU/makefile.mk @@ -72,7 +72,6 @@ COMPONENT_FILES= \ $(EXTENSIONDIR)$/dialog/hu_HU_en_US.properties \ $(EXTENSIONDIR)$/dialog/hu_HU_hu_HU.properties \ $(EXTENSIONDIR)$/dialog/hu_HU.xdl \ - $(EXTENSIONDIR)$/dialog/OptionsDialog.xcu \ $(EXTENSIONDIR)$/dialog/OptionsDialog.xcs \ $(EXTENSIONDIR)$/README_lightproof_hu_HU.txt @@ -88,6 +87,14 @@ PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE) COMPONENT_UNZIP_FILES= \ $(EXTENSIONDIR)$/th_hu_HU_v2.idx +.IF "$(WITH_LANG)" != "" +PROPERTIES_LOCALIZED:=$(MISC)/$(EXTENSIONNAME)_in/properties_localized +COMPONENT_UNZIP_FILES+=$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu $(PROPERTIES_LOCALIZED) +.ELSE +COMPONENT_FILES+=$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu +.ENDIF + + # add own targets to packing dependencies (need to be done before # packing the xtension # EXTENSION_PACKDEPS=makefile.mk $(CUSTOM_LICENSE) @@ -108,4 +115,16 @@ $(EXTENSIONDIR)$/th_hu_HU_v2.idx : "$(EXTENSIONDIR)$/th_hu_HU_v2.dat" $(DESCRIPTION_SRC) : description.xml @@-$(MKDIRHIER) $(@:d) $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $< -o $@ -m $(LOCALIZESDF) -l all +$(EXTENSIONDIR)/dialog/OptionsDialog.xcu : dialog/OptionsDialog.xcu + $(COMMAND_ECHO)$(CFGEX) -p $(PRJNAME) \ + -i $< \ + -o $(EXTENSIONDIR)/dialog/OptionsDialog.xcu \ + -m $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/dictionaries/hu_HU/dialog/localize.sdf \ + -l all +$(PROPERTIES_LOCALIZED) : $(EXTENSIONDIR)/dialog/hu_HU_en_US.properties + $(COMMAND_ECHO)$(PERL) $(OUTDIR)/bin/propmerge \ + -i $< \ + -m $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/dictionaries/hu_HU/dialog/localize.sdf + @@-rm $(EXTENSIONDIR)/dialog/hu_HU_hu.properties + @@-$(TOUCH) $(PROPERTIES_LOCALIZED) .ENDIF diff --git a/dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties b/dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties deleted file mode 100644 index d7df847..0000000 --- a/dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties +++ /dev/null @@ -1,15 +0,0 @@ -abbreviation=\u0410\u0431\u0431\u0440\u0435\u0432\u0438\u0430\u0442\u0443\u0440\u044b -grammar=\u0413\u0440\u0430\u043c\u043c\u0430\u0442\u0438\u043a\u0430 -hyphen=\u0414\u0435\u0444\u0438\u0441 -comma=\u041f\u0443\u043d\u043a\u0442\u0443\u0430\u0446\u0438\u044f -common=\u041e\u0431\u0449\u0438\u0435 \u043e\u0448\u0438\u0431\u043a\u0438 -multiword=\u0421\u043b\u043e\u0432\u043e\u0441\u043e\u0447\u0435\u0442\u0430\u043d\u0438\u044f -together=\u0421\u043b\u0438\u0442\u043d\u043e/\u0440\u0430\u0437\u0434\u0435\u043b\u044c\u043d\u043e -proofreading=\u0421\u0442\u0438\u043b\u0438\u0441\u0442\u0438\u043a\u0430 -space=\u041f\u0440\u043e\u0431\u0435\u043b -typographica=\u0422\u0438\u043f\u043e\u0433\u0440\u0430\u0444\u0438\u043a\u0430 -dup=\u041f\u043e\u0432\u0442\u043e\u0440 \u0441\u043b\u043e\u0432 \u0432 \u0441\u043b\u043e\u0432\u043e\u0441\u043e\u0447\u0435\u0442\u0430\u043d\u0438\u044f\u0445 -dup2=\u041f\u043e\u0432\u0442\u043e\u0440 \u0441\u043b\u043e\u0432 \u0432 \u043f\u0440\u0435\u0434\u043b\u043e\u0436\u0435\u043d\u0438\u044f\u0445 -others=\u041f\u0440\u043e\u0447\u0435\u0435 -numsep=\u0420\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u0435\u043b\u0438 \u0433\u0440\u0443\u043f\u043f \u0440\u0430\u0437\u0440\u044f\u0434\u043e\u0432 (ISO) \u0434\u043b\u044f \u0447\u0438\u0441\u0435\u043b -quotation=\u041a\u0430\u0432\u044b\u0447\u043a\u0438 diff --git a/dictionaries/ru_RU/makefile.mk b/dictionaries/ru_RU/makefile.mk index 9612e77..a3fcb26 100644 --- a/dictionaries/ru_RU/makefile.mk +++ b/dictionaries/ru_RU/makefile.mk @@ -67,9 +67,7 @@ COMPONENT_FILES= \ $(EXTENSIONDIR)$/pythonpath/lightproof_opts_ru_RU.py \ $(EXTENSIONDIR)$/dialog/ru_RU_en_US.default \ $(EXTENSIONDIR)$/dialog/ru_RU_en_US.properties \ - $(EXTENSIONDIR)$/dialog/ru_RU_ru_RU.properties \ $(EXTENSIONDIR)$/dialog/ru_RU.xdl \ - $(EXTENSIONDIR)$/dialog/OptionsDialog.xcu \ $(EXTENSIONDIR)$/dialog/OptionsDialog.xcs COMPONENT_CONFIGDEST=. @@ -84,6 +82,13 @@ PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE) COMPONENT_UNZIP_FILES= \ $(EXTENSIONDIR)$/th_ru_RU_v2.idx +.IF "$(WITH_LANG)" != "" +PROPERTIES_LOCALIZED:=$(MISC)/$(EXTENSIONNAME)_in/properties_localized +COMPONENT_UNZIP_FILES+=$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu $(PROPERTIES_LOCALIZED) +.ELSE +COMPONENT_FILES+=$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu +.ENDIF + # add own targets to packing dependencies (need to be done before # packing the xtension # EXTENSION_PACKDEPS=makefile.mk $(CUSTOM_LICENSE) @@ -104,4 +109,15 @@ $(EXTENSIONDIR)$/th_ru_RU_v2.idx : "$(EXTENSIONDIR)$/th_ru_RU_v2.dat" $(DESCRIPTION_SRC) : description.xml @@-$(MKDIRHIER) $(@:d) $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $< -o $@ -m $(LOCALIZESDF) -l all +$(EXTENSIONDIR)/dialog/OptionsDialog.xcu : dialog/OptionsDialog.xcu + $(COMMAND_ECHO)$(CFGEX) -p $(PRJNAME) \ + -i $< \ + -o $(EXTENSIONDIR)/dialog/OptionsDialog.xcu \ + -m $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/dictionaries/ru_RU/dialog/localize.sdf \ + -l all +$(PROPERTIES_LOCALIZED) : $(EXTENSIONDIR)/dialog/ru_RU_en_US.properties + $(COMMAND_ECHO)$(PERL) $(OUTDIR)/bin/propmerge \ + -i $< \ + -m $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/dictionaries/ru_RU/dialog/localize.sdf + @@-$(TOUCH) $(PROPERTIES_LOCALIZED) .ENDIF -- cgit