ソースを参照

! Should hopefully clear up ambiguity for the user given our internal vs displayed terminology and fix #1278 in the process. Hopefully.

Signed-off-by: Peter Spicer <[email protected]>
Peter Spicer 10 年 前
コミット
b3061e4aee

+ 2 - 2
Sources/ManageBans.php

@@ -1289,7 +1289,7 @@ function addTriggers($group_id = 0, $triggers = array(), $logs = array())
 	global $smcFunc;
 
 	if (empty($group_id))
-		$context['ban_errors'][] = 'ban_group_id_empty';
+		$context['ban_errors'][] = 'ban_id_empty';
 
 	// Preset all values that are required.
 	$values = array(
@@ -1385,7 +1385,7 @@ function updateTriggers($ban_item = 0, $group_id = 0, $trigger = array(), $logs
 	if (empty($ban_item))
 		$context['ban_errors'][] = 'ban_ban_item_empty';
 	if (empty($group_id))
-		$context['ban_errors'][] = 'ban_group_id_empty';
+		$context['ban_errors'][] = 'ban_id_empty';
 	if (empty($trigger))
 		$context['ban_errors'][] = 'ban_no_triggers';
 

+ 1 - 1
Themes/default/languages/Admin.english.php

@@ -147,7 +147,7 @@ $txt['ban_ip'] = 'IP banning: (e.g. 192.168.12.213 or 128.0.*.*) - one entry per
 $txt['ban_email'] = 'Email banning: (e.g. [email protected]) - one entry per line';
 $txt['ban_username'] = 'User name banning: (e.g. l33tuser) - one entry per line';
 
-$txt['ban_errors_detected'] = 'The following error or errors occurred while saving or editing the ban group or trigger';
+$txt['ban_errors_detected'] = 'The following error or errors occurred while saving or editing the ban';
 $txt['ban_description'] = 'Here you can ban troublesome people either by IP, hostname, username, or email.';
 $txt['ban_add_new'] = 'Add new ban';
 $txt['ban_banned_entity'] = 'Banned entity';

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

@@ -187,7 +187,6 @@ $txt['ban_not_found'] = 'Ban not found';
 $txt['ban_unknown_restriction_type'] = 'Restriction type unknown';
 $txt['ban_name_empty'] = 'The name of the ban was left empty';
 $txt['ban_id_empty'] = 'Ban id not found';
-$txt['ban_group_id_empty'] = 'Ban group id missing';
 $txt['ban_no_triggers'] = 'No ban triggers specified';
 $txt['ban_ban_item_empty'] = 'Ban trigger not found';
 $txt['impossible_insert_new_bangroup'] = 'An error occurred while inserting the new ban';