[Svn] r4285 - in branches/devel-addressbook/program: localization/en_US steps/addressbook

trac at roundcube.net trac at roundcube.net
Sat Nov 27 17:47:07 CET 2010


Author: thomasb
Date: 2010-11-27 10:47:07 -0600 (Sat, 27 Nov 2010)
New Revision: 4285

Modified:
   branches/devel-addressbook/program/localization/en_US/labels.inc
   branches/devel-addressbook/program/steps/addressbook/func.inc
Log:
Fix address form rendering + added missing labels for gender

Modified: branches/devel-addressbook/program/localization/en_US/labels.inc
===================================================================
--- branches/devel-addressbook/program/localization/en_US/labels.inc	2010-11-27 16:37:22 UTC (rev 4284)
+++ branches/devel-addressbook/program/localization/en_US/labels.inc	2010-11-27 16:47:07 UTC (rev 4285)
@@ -275,6 +275,8 @@
 $labels['website']      = 'Website';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['gemale'] = 'female';
 
 $labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Add new contact';

Modified: branches/devel-addressbook/program/steps/addressbook/func.inc
===================================================================
--- branches/devel-addressbook/program/steps/addressbook/func.inc	2010-11-27 16:37:22 UTC (rev 4284)
+++ branches/devel-addressbook/program/steps/addressbook/func.inc	2010-11-27 16:47:07 UTC (rev 4285)
@@ -363,21 +363,18 @@
         $content = '';
         if (is_array($fieldset['content'])) {
             foreach ($fieldset['content'] as $col => $colprop) {
-                // skip cols unknown to the backend
-                if (!$coltypes[$col])
-                    continue;
-                
                 // remove subtype part of col name
                 list($field, $subtype) = explode(':', $col);
-                if (!$subtype)
-                  $subtype = 'home';
-
+                if (!$subtype) $subtype = 'home';
                 $fullkey = $col.':'.$subtype;
-                $label = isset($colprop['label']) ? $colprop['label'] : rcube_label($col);
-                
+
+                // skip cols unknown to the backend
+                if (!$coltypes[$field])
+                    continue;
+
                 // merge colprop with global coltype configuration
-                if ($coltypes[$field])
-                    $colprop += $coltypes[$field];
+                $colprop += $coltypes[$field];
+                $label = isset($colprop['label']) ? $colprop['label'] : rcube_label($col);
 
                 // prepare subtype selector in edit mode
                 if ($edit_mode && is_array($colprop['subtypes'])) {

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list