dictionaries | 2 +-
readlicense_oo/license/license.xml | 9 +++++++++
scp2/source/ooo/file_ooo.scp | 9 +++++++++
scp2/source/ooo/module_ooo.scp | 11 +++++++++++
scp2/source/ooo/module_ooo.ulf | 6 ++++++
setup_native/source/packinfo/packinfo_office.txt | 15 +++++++++++++++
setup_native/source/packinfo/spellchecker_selection.txt | 1 +
7 files changed, 52 insertions(+), 1 deletion(-)
New commits:
commit 7bc61569e25fe0c32063896eced72219cc4fb3f5
Author: Aron Budea <aron.bu...@collabora.com>
AuthorDate: Fri Aug 26 04:14:39 2022 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Aug 27 17:55:44 2022 +0200
Add Persian (fa-IR) dictionary to installset
Change-Id: I7abf38be5c8d8c8bfb7eb3a756695054b4275f9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138892
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Jenkins
diff --git a/readlicense_oo/license/license.xml
b/readlicense_oo/license/license.xml
index d1dec6ad962f..1fbcd05554fc 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -3733,6 +3733,15 @@
Public License as published by the Free Software Foundation; either
version 2 of the License, or (at your
option) any later version.</p>
<p><a href="#a__GPL_version_2">Jump to GPL Version 2</a></p>
+ <h2>Persian (Farsi)</h2>
+ <h3>Spelling dictionary</h3>
+ <p>The following software may be included in this product: Persian
(Farsi) spelling dictionary. Use of any of this
+ software is governed by the terms of the license below:</p>
+ <p>Lilak, Persian Spell Checking Dictionary</p>
+ <p>Copyright (C) 2015 Mostafa Sedaghat Joo</p>
+ <p>Lilak is an open source project for generating Persian dictionary
for hunspell spell checker based on Persian
+ Morphology. This dictionary is free and the source is available under
Apache License Version 2.0.</p>
+ <p><a href="#a__Apache_License_version_2_0">Jump to Apache License
Version 2.0</a></p>
<h2>Polish</h2>
<h3>Spelling dictionary</h3>
<p>The following software may be included in this product: Polish
spelling dictionary. Use of any of this
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 3561a2e2ddc8..dc85a8b0154c 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -437,6 +437,15 @@ File gid_File_Extension_Dictionary_Et
End
#endif
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Fa
+ Dir = FILELIST_DIR;
+ Name = "Dictionary/dict-fa.filelist";
+ Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+ TXT_FILE_BODY;
+End
+#endif
+
#if defined WITH_MYSPELL_DICTS
File gid_File_Extension_Dictionary_Fr
Dir = FILELIST_DIR;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 7538d02f6a01..582c5e1e1dae 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -335,6 +335,17 @@ Module gid_Module_Root_Extension_Dictionary_Et
Styles = ();
End
+Module gid_Module_Root_Extension_Dictionary_Fa
+ MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_FA );
+ Files = (gid_File_Extension_Dictionary_Fa);
+ InstallOrder = "2000";
+ Sortkey = "658";
+ Spellcheckerlanguage = "fa";
+ PackageInfo = "packinfo_office.txt";
+ ParentID = gid_Module_Dictionaries;
+ Styles = ();
+End
+
Module gid_Module_Root_Extension_Dictionary_Fr
MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_FR );
Files = (gid_File_Extension_Dictionary_Fr);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 9fcbda9fec88..f6b94dd637e3 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -154,6 +154,12 @@ en-US = "Estonian"
[STR_DESC_MODULE_EXTENSION_DICTIONARY_ET]
en-US = "Estonian spelling dictionary, and hyphenation rules"
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_FA]
+en-US = "Persian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_FA]
+en-US = "Persian Spell Checking Dictionary"
+
[STR_NAME_MODULE_EXTENSION_DICTIONARY_FR]
en-US = "French"
diff --git a/setup_native/source/packinfo/packinfo_office.txt
b/setup_native/source/packinfo/packinfo_office.txt
index 6aed60aea7e7..a9c6d01bef30 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -642,6 +642,21 @@ destpath = "/opt"
packageversion = "%PACKAGEVERSION"
End
+Start
+module = "gid_Module_Root_Extension_Dictionary_Fa"
+solarispackagename =
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-fa"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core,
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-fa"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core
%PACKAGEVERSION
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+linuxpatchrequires = ""
+copyright = "2015 Mostafa Sedaghat Joo"
+solariscopyright = "solariscopyrightfile"
+vendor = "Mostafa Sedaghat Joo"
+description = "Fa dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
Start
module = "gid_Module_Root_Extension_Dictionary_Fr"
solarispackagename =
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-fr"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt
b/setup_native/source/packinfo/spellchecker_selection.txt
index 7d4f8b25a83d..602bf0b51603 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -47,6 +47,7 @@ en-ZA = "en,es,fr"
eo = "eo"
es = "es,an,ca,fr,gl,oc,pt-PT"
et = "et"
+fa = "fa"
fr = "fr,es"
gd = "gd"
gl = "gl,pt-PT,es"
commit 1d5b0b89e2f757709d59b3cfdc5a7a23ec4d8326
Author: Aron Budea <aron.bu...@collabora.com>
AuthorDate: Sat Aug 27 17:55:39 2022 +0200
Commit: Gerrit Code Review <ger...@gerrit.libreoffice.org>
CommitDate: Sat Aug 27 17:55:39 2022 +0200
Update git submodules
* Update dictionaries from branch 'master'
to 1bee012fc52a625fe0e0abec071ed1b002fac918
- Add Persian (fa-IR) dictionary
Change-Id: I906c924dfe346898f7f5c69d2c1a3e6ae9424651
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/138891
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/dictionaries b/dictionaries
index d201d1180ce0..1bee012fc52a 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit d201d1180ce044fe49e167d0d5b6d182a0f2850d
+Subproject commit 1bee012fc52a625fe0e0abec071ed1b002fac918
