Changeset 2820

Show
Ignore:
Timestamp:
07/19/08 22:39:51 (3 months ago)
Author:
bchoate
Message:

Make the display name a required field for all authentication methods. BugId:80675

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/release-41/lib/MT/CMS/User.pm

    r2774 r2820  
    15571557    my $name     = $app->param('name'); 
    15581558    my $nickname = $app->param('nickname'); 
     1559 
    15591560    if ( $pref eq 'MT' ) { 
    15601561        if ( defined $name ) { 
     
    15641565        return $eh->error( $app->translate("User requires username") ) 
    15651566          if ( !$name ); 
    1566  
    1567         if ( defined $nickname ) { 
    1568             $nickname =~ s/(^\s+|\s+$)//g; 
    1569             $app->param( 'nickname', $nickname ); 
    1570         } 
     1567    } 
     1568 
     1569    # Display name is required for all auth types; for new users 
     1570    # under external auth, the field is not shown, so the value is 
     1571    # undefined. Only check requirement if the value is defined. 
     1572    if ( defined $nickname ) { 
     1573        $nickname =~ s/(^\s+|\s+$)//g; 
     1574        $app->param( 'nickname', $nickname ); 
    15711575        return $eh->error( $app->translate("User requires display name") ) 
    1572           if ( !$nickname ); 
     1576          if ( !length( $nickname ) ); 
    15731577    } 
    15741578 
     
    16141618    if ( $app->param('url') ) { 
    16151619        my $url = $app->param('url'); 
    1616         return $eh->error( MT->translate("Website URL is imperfect") ) 
     1620        return $eh->error( MT->translate("Website URL is invalid") ) 
    16171621          unless is_url($url); 
    16181622    } 
  • branches/release-41/lib/MT/L10N/de.pm

    r2768 r2820  
    10921092        'User requires password recovery word/phrase' => 'Passwort-Erinnerungssatz erforderlich', 
    10931093        'Email Address is required for password recovery' => 'E-Mail-Adresse erforderlich (fÃŒr Passwort-Anforderungen)', 
    1094         'Website URL is imperfect' => 'Website-URL ungÃŒltig', 
     1094        'Website URL is invalid' => 'Website-URL ungÃŒltig', 
    10951095        'User \'[_1]\' (ID:[_2]) created by \'[_3]\'' => 'Benutzer \'[_1]\' (ID:[_2]) angelegt von \'[_3]\'', 
    10961096        'User \'[_1]\' (ID:[_2]) deleted by \'[_3]\'' => 'Benutzer \'[_1]\' (ID:[_2]) gelöscht von \'[_3]\'', 
  • branches/release-41/lib/MT/L10N/es.pm

    r2796 r2820  
    10991099        'User requires password recovery word/phrase' => 'El usario necesita una palabra/frase de recuperación de contraseña', 
    11001100        'Email Address is required for password recovery' => 'La dirección de correo es necesaria para la recuperación de la contraseña', 
    1101         'Website URL is imperfect' => 'La URL del sitio es incorrecta', 
     1101        'Website URL is invalid' => 'La URL del sitio es incorrecta', 
    11021102        'User \'[_1]\' (ID:[_2]) created by \'[_3]\'' => 'Usuario \'[_1]\' (ID:[_2]) creado por \'[_3]\'', 
    11031103        'User \'[_1]\' (ID:[_2]) deleted by \'[_3]\'' => 'Usuario \'[_1]\' (ID:[_2]) borrado por \'[_3]\'', 
  • branches/release-41/lib/MT/L10N/fr.pm

    r2782 r2820  
    10991099        'User requires password recovery word/phrase' => 'L\'utilisateur a besoin d\'une phrase de récupération de mot de passe', 
    11001100        'Email Address is required for password recovery' => 'L\'adresse email est nécessaire pour récupérer le mot de passe', 
    1101         'Website URL is imperfect' => 'L\'URL du site web n\'est pas valide', 
     1101        'Website URL is invalid' => 'L\'URL du site web n\'est pas valide', 
    11021102        'User \'[_1]\' (ID:[_2]) created by \'[_3]\'' => 'Utilisateur \'[_1]\' (ID:[_2]) créé par \'[_3]\'', 
    11031103        'User \'[_1]\' (ID:[_2]) deleted by \'[_3]\'' => 'Utilisateur \'[_1]\' (ID:[_2]) supprimé par \'[_3]\'', 
  • branches/release-41/lib/MT/L10N/ja.pm

    r2806 r2820  
    12141214        'Email Address is required for password recovery' => 'メヌルアドレスはパスワヌドを再蚭定できるようにするために忠
    12151215芁です。', 
    1216         'Website URL is imperfect' => 'URLが䞍完å 
     1216        'Website URL is invalid' => 'URLが䞍完å 
    12171217šã§ã™ã€‚', 
    12181218        'User \'[_1]\' (ID:[_2]) created by \'[_3]\'' => '\'[_3]\'がナヌザヌ\'[_1]\'(ID:[_2])を䜜成したした。', 
  • branches/release-41/lib/MT/L10N/nl.pm

    r2782 r2820  
    10991099        'User requires password recovery word/phrase' => 'Gebruiker heeft een woord/uitdrukking nodig om het wachtwoord te kunnen terugvinden', 
    11001100        'Email Address is required for password recovery' => 'E-mail adres is vereist voor het terugvinden van een wachtwoord', 
    1101         'Website URL is imperfect' => 'Website URL is imperfect', 
     1101        'Website URL is invalid' => 'Website URL is imperfect', 
    11021102        'User \'[_1]\' (ID:[_2]) created by \'[_3]\'' => 'Gebruiker \'[_1]\' (ID:[_2]) aangemaakt door \'[_3]\'', 
    11031103        'User \'[_1]\' (ID:[_2]) deleted by \'[_3]\'' => 'Gebruiker \'[_1]\' (ID:[_2]) verwijderd door \'[_3]\'',