diff options
| author | Andras Timar <atimar@suse.com> | 2013-02-08 22:29:35 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-02-08 22:31:16 +0100 |
| commit | a4547696d272588374fd391233626df986275870 (patch) | |
| tree | 3728df393d293765aa86762f781c3c8af945110d | |
| parent | 63ca871bf8f14e0450e5da0dbcfa3ee5d48f1604 (diff) | |
fdo#50827 move language dependent wordlists to the appropriate dict pack
Change-Id: Ie60051b65834cdfc748d12a71089a683f3108335
| -rw-r--r-- | extras/Module_extras.mk | 2 | ||||
| -rw-r--r-- | extras/Package_wordbook.mk (renamed from extras/Zip_wordbook.mk) | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/file_extra_ooo.scp | 24 | ||||
| -rw-r--r-- | scp2/source/ooo/module_ooo.scp | 4 |
4 files changed, 27 insertions, 7 deletions
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 31659809c22e..d3f6e0778967 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -14,6 +14,7 @@ $(eval $(call gb_Module_add_targets,extras,\ CustomTarget_autocorr \ Package_fonts \ Package_newfiles \ + Package_wordbook \ Zip_autocorr \ Zip_autotextuser \ Zip_cfgsrvbitmapunx \ @@ -38,7 +39,6 @@ $(eval $(call gb_Module_add_targets,extras,\ Zip_tplwizletter \ Zip_tplwizreport \ Zip_tplwizstyles \ - Zip_wordbook \ )) ifeq ($(WITH_EXTRA_EXTENSIONS),YES) diff --git a/extras/Zip_wordbook.mk b/extras/Package_wordbook.mk index 76416657e79b..dc79fa85857a 100644 --- a/extras/Zip_wordbook.mk +++ b/extras/Package_wordbook.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,wordbook,$(SRCDIR)/extras/source/wordbook)) +$(eval $(call gb_Package_Package,extras_wordbook,$(SRCDIR)/extras/source/wordbook)) -$(eval $(call gb_Zip_add_files,wordbook,\ +$(eval $(call gb_Package_add_files,extras_wordbook,pck,\ en-GB.dic \ en-US.dic \ sl.dic \ diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index 5ba170b3a6fc..260c83546a0d 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -403,7 +403,27 @@ End File gid_File_Extra_Wordbook Dir = gid_Dir_Wordbook; + PACKED_TXT_FILE_BODY; + Name = "technical.dic"; +End + +File gid_File_Extra_Wordbook_en_US + Dir = gid_Dir_Wordbook; TXT_FILE_BODY; - Styles = (ARCHIVE, DONT_OVERWRITE); - Name = "wordbook.zip"; + Styles = (PACKED, FORCELANGUAGEPACK); + Name = "en-US.dic"; +End + +File gid_File_Extra_Wordbook_en_GB + Dir = gid_Dir_Wordbook; + TXT_FILE_BODY; + Styles = (PACKED, FORCELANGUAGEPACK); + Name = "en-GB.dic"; +End + +File gid_File_Extra_Wordbook_sl + Dir = gid_Dir_Wordbook; + TXT_FILE_BODY; + Styles = (PACKED, FORCELANGUAGEPACK); + Name = "sl.dic"; End diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp index dfa83912cec8..945c133bc507 100644 --- a/scp2/source/ooo/module_ooo.scp +++ b/scp2/source/ooo/module_ooo.scp @@ -189,7 +189,7 @@ End Module gid_Module_Root_Extension_Dictionary_En MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_EN ); - Files = (gid_File_Extension_Dictionary_En); + Files = (gid_File_Extension_Dictionary_En, gid_File_Extra_Wordbook_en_US, gid_File_Extra_Wordbook_en_GB); InstallOrder = "2000"; Sortkey = "550"; Spellcheckerlanguage = "en"; @@ -486,7 +486,7 @@ End Module gid_Module_Root_Extension_Dictionary_Sl MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SL ); - Files = (gid_File_Extension_Dictionary_Sl); + Files = (gid_File_Extension_Dictionary_Sl, gid_File_Extra_Wordbook_sl); InstallOrder = "2000"; Sortkey = "710"; Spellcheckerlanguage = "sl"; |