Merge branch '1.0'

ezsystems · Apr 23, 2020 · e09f22e · e09f22e
2 parents d04acbf + 6a9df1d
commit e09f22e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/eZ/Bundle/EzPublishCoreBundle/Resources/config/locale.yml b/eZ/Bundle/EzPublishCoreBundle/Resources/config/locale.yml
@@ -20,6 +20,7 @@ parameters:
         epo-EO: eo
         esl-ES: es_ES
         esl-MX: es_MX
+        fas-IR: fa_IR
         fin-FI: fi_FI
         fre-BE: fr_BE
         fre-CA: fr_CA
@@ -65,6 +66,7 @@ parameters:
         en: ['eng-GB', 'eng-US']
         en_us: ['eng-US']
         es: ['esl-ES']
+        fa: ['fas-IR']
         fi: ['fin-FI']
         fr: ['fre-FR']
         gb: ['eng-GB']

diff --git a/eZ/Publish/Core/MVC/Symfony/Locale/LocaleConverterInterface.php b/eZ/Publish/Core/MVC/Symfony/Locale/LocaleConverterInterface.php
@@ -8,7 +8,7 @@
 
 /**
  * Interface for locale converters.
- * eZ Publish uses <ISO639-2/B>-<ISO3166-Alpha2> locale format (mostly, some supported locales being out of this format, e.g. cro-HR).
+ * eZ Platform uses <ISO639-2/B>-<ISO3166-Alpha2> locale format (mostly, some supported locales being out of this format, e.g. cro-HR).
  * Symfony uses the standard POSIX locale format (<ISO639-1>_<ISO3166-Alpha2>), which is supported by Intl PHP extension.
  *
  * Locale converters are meant to convert in those 2 formats back and forth.