Browse Source

plural on karma fatal error karma_wait_time [Bug 1853]

emanuele 13 years ago
parent
commit
d1f543e957

+ 1 - 1
Sources/Karma.php

@@ -104,7 +104,7 @@ function ModifyKarma()
 	{
 		// If you are gonna try to repeat.... don't allow it.
 		if ($action == $dir)
-			fatal_lang_error('karma_wait_time', false, array($modSettings['karmaWaitTime'], $txt['hours']));
+			fatal_lang_error('karma_wait_time', false, array($modSettings['karmaWaitTime'], ($modSettings['karmaWaitTime'] == 1 ? strtolower($txt['hour']) : $txt['hours'])));
 
 		// You decided to go back on your previous choice?
 		$smcFunc['db_query']('', '

+ 0 - 1
Themes/default/languages/ManagePaid.english.php

@@ -145,7 +145,6 @@ $txt['start_date_and_time'] = 'Start Date and Time';
 $txt['end_date_and_time'] = 'End Date and Time';
 $txt['edit'] = 'EDIT';
 $txt['one_username'] = 'Please enter one username only.';
-$txt['hour'] = 'Hour';
 $txt['minute'] = 'Minute';
 $txt['error_member_not_found'] = 'The member entered could not be found';
 $txt['member_already_subscribed'] = 'This member is already subscribed to this subscription. Please edit their existing subscription.';

+ 2 - 0
Themes/default/languages/index.english.php

@@ -285,6 +285,8 @@ $txt['www'] = 'WWW';
 $txt['by'] = 'by';
 
 $txt['hours'] = 'hours';
+// Used upper case in Paid subscriptions management
+$txt['hour'] = 'Hour';
 $txt['days_word'] = 'days';
 
 $txt['newest_member'] = ', our newest member.';