Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Take special language 'XX' into account (as specified in KEP:16)

Browse source
This commit is contained in:
Thomas Bruederli 2012-05-23 15:41:13 +02:00
parent 7d1882ad76
commit 16e0220b6c
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/kolab_config/kolab_config.php
View file

@ -168,15 +168,14 @@ class kolab_config extends rcube_plugin
continue;
foreach ((array)$folder->select($query) as $object) {
if ($object['type'] == 'dictionary' && $object['language'] == $lang) {
if ($object['type'] == 'dictionary' && ($object['language'] == $lang || $object['language'] == 'XX')) {
if (is_array($this->dicts[$lang]))
$this->dicts[$lang]['e'] = array_merge((array)$this->dicts[$lang]['e'], $object['e']);
else
$this->dicts[$lang] = $object;
// make sure the default object is cached
if ($folder->default) {
if ($folder->default && $object['language'] != 'XX') {
$object['e'] = $this->dicts[$lang]['e'];
$this->dicts[$lang] = $object;
}