From 8703b0801865eb47505c960037d916253e315fc7 Mon Sep 17 00:00:00 2001 From: alecpl Date: Mon, 12 Sep 2011 12:52:01 +0000 Subject: - Extend rcube_label_exists() to search in loaded plugins localizations - Allow use localized addressbook field subtypes from plugins --- program/steps/addressbook/func.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'program/steps/addressbook/func.inc') diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index b290bbb2d..a1491545f 100644 --- a/program/steps/addressbook/func.inc +++ b/program/steps/addressbook/func.inc @@ -408,12 +408,12 @@ function rcmail_get_rowcount_text($result=null) function rcmail_get_type_label($type) { $label = 'type'.$type; - if (rcube_label_exists($label)) - return rcube_label($label); + if (rcube_label_exists($label, '*', $domain)) + return rcube_label($label, $domain); else if (preg_match('/\w+(\d+)$/', $label, $m) && ($label = preg_replace('/(\d+)$/', '', $label)) - && rcube_label_exists($label)) - return rcube_label($label) . ' ' . $m[1]; + && rcube_label_exists($label, '*', $domain)) + return rcube_label($label, $domain) . ' ' . $m[1]; return ucfirst($type); } -- cgit v1.2.3