Changeset 1549 for trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model

Timestamp:

12/28/15 17:45:18 (9 years ago)

Author:

nanardon

Message:

Fix I18N

Location:

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model

Files:

• AttrForms.pm (modified) (1 diff)
• AttrFormsA.pm (modified) (1 diff)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm

@@ -323 +323 @@
     if ($label) {
         return $label;
-    } elsif (my $hash = LATMOS::Accounts::Web->config->{attrs}{$attr}) {
-        return $hash->{label};
     } else {
-       return $attr;
+        my $oattr = $self->base->attribute($self->otype, $attr); 
+        return $oattr->{label} ? $oattr->{label}->() : $attr;
     } 
 }

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrFormsA.pm

@@ -89 +89 @@
         ($hint ? sprintf('title="%s"', $self->escape($hint)) : ''),
         $self->escape($self->htmlname),
-        $self->escape($self->hconfig('label') || $self->htmlname),
+        $self->escape($self->{label} || $self->htmlname),
     );
 }