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

Timestamp:

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

Author:

nanardon

Message:

Fix I18N

Location:

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

Files:

• I18N/fr.po (modified) (1 diff)
• Model/AttrForms.pm (modified) (1 diff)
• Model/AttrFormsA.pm (modified) (1 diff)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/I18N/fr.po

@@ +1 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: 1\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Olivier Thauvin <olivier.thauvin@latmos.ipsl.fr\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: root/html/includes/wrapper.tt:47
 msgid "IT management"

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),
     );
 }