summaryrefslogtreecommitdiff
path: root/extras
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2014-06-18 21:08:03 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-07-05 14:14:08 +0000
commit1f407caeb3f6e2605973458a545547ed82e7da1c (patch)
treefdb3562bfd7649aeac1ff4c01eb879b80ba26c29 /extras
parent63e4cd95be982da3b85883cde067b5e06c6e5efb (diff)
Resolves fdo#79276 Add fallback system for autocorrection of French variants
1) Replace the creation of acor_fr-FR.dat by acor_fr.dat since there's no specific for variants of fr 2) Add a fallback system to use it Reviewed-on: https://gerrit.libreoffice.org/9825 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Conflicts: editeng/source/misc/svxacorr.cxx include/editeng/svxacorr.hxx sw/source/core/edit/acorrect.cxx Change-Id: Ia3e11fff0f266839dc148077b50c1b2f798d1c50 Reviewed-on: https://gerrit.libreoffice.org/10065 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'extras')
-rw-r--r--extras/CustomTarget_autocorr.mk2
-rw-r--r--extras/Package_autocorr.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk
index 66d32f6a8a65..ddafa020f7f4 100644
--- a/extras/CustomTarget_autocorr.mk
+++ b/extras/CustomTarget_autocorr.mk
@@ -23,7 +23,7 @@ extras_AUTOCORR_LANGS := \
es:es-ES \
fa:fa-IR \
fi:fi-FI \
- fr:fr-FR \
+ fr:fr \
ga-IE:ga-IE \
hr:hr-HR \
hu:hu-HU \
diff --git a/extras/Package_autocorr.mk b/extras/Package_autocorr.mk
index e42e3d1215d3..8c71a60d1aa3 100644
--- a/extras/Package_autocorr.mk
+++ b/extras/Package_autocorr.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Package_add_files,extras_autocorr,$(LIBO_SHARE_FOLDER)/autocorr
acor_es-ES.dat \
acor_fa-IR.dat \
acor_fi-FI.dat \
- acor_fr-FR.dat \
+ acor_fr.dat \
acor_ga-IE.dat \
acor_hr-HR.dat \
acor_hu-HU.dat \