From 3c435a4a653b37058599eeb1f70183f16430cc6e Mon Sep 17 00:00:00 2001 From: Raimond Spekking Date: Wed, 1 Aug 2007 10:00:18 +0000 Subject: [PATCH] No need to separate 'passwordtooshort' from other password related messages --- languages/messages/MessagesEn.php | 3 +-- maintenance/language/messages.inc | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index e71ba85652..4167a539b6 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -847,6 +847,7 @@ Your account has been created. Don't forget to change your {{SITENAME}} preferen 'nouserspecified' => 'You have to specify a username.', 'wrongpassword' => 'Incorrect password entered. Please try again.', 'wrongpasswordempty' => 'Password entered was blank. Please try again.', +'passwordtooshort' => 'Your password is invalid or too short. It must have at least $1 characters and be different from your username.', 'mailmypassword' => 'E-mail password', 'passwordremindertitle' => 'Password reminder from {{SITENAME}}', 'passwordremindertext' => 'Someone (probably you, from IP address $1) @@ -2450,8 +2451,6 @@ Variants for Chinese language 'variantname-ku-latn' => 'ku-latn', # only translate this message to other languages if you have to change it 'variantname-ku' => 'ku', # only translate this message to other languages if you have to change it -'passwordtooshort' => 'Your password is invalid or too short. It must have at least $1 characters and be different from your username.', - # Metadata 'metadata' => 'Metadata', 'metadata-help' => 'This file contains additional information, probably added from the digital camera or scanner used to create or digitize it. If the file has been modified from its original state, some details may not fully reflect the modified image.', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index a903f3a1d0..e36553f0da 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -376,6 +376,7 @@ $wgMessageStructure = array( 'nouserspecified', 'wrongpassword', 'wrongpasswordempty', + 'passwordtooshort', 'mailmypassword', 'passwordremindertitle', 'passwordremindertext', @@ -1720,9 +1721,6 @@ $wgMessageStructure = array( 'variantname-ku-latn', 'variantname-ku', ), - 'passwordtooshort' => array( - 'passwordtooshort', - ), 'metadata' => array( 'metadata', 'metadata-help', @@ -2297,7 +2295,6 @@ Variants for Chinese language", 'variantname-sr' => 'Variants for Serbian language', 'variantname-kk' => 'Variants for Kazakh language', 'variantname-ku' => 'Variants for Kurdish language', - 'passwordtooshort' => '', 'media-info' => 'Media information', 'metadata' => 'Metadata', 'exif' => 'EXIF tags', -- 2.20.1