From 29ec455a457574b58b3f4ce30323ea22d72389db Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 25 Jun 2014 22:14:33 +0200 Subject: [PATCH] [ticket/12462] Do not use string "None" for different options ... it limits translations. PHPBB3-12462 --- phpBB/adm/style/acp_groups.html | 2 +- phpBB/adm/style/acp_users_avatar.html | 2 +- phpBB/language/en/ucp.php | 1 + phpBB/styles/prosilver/template/ucp_avatar_options.html | 2 +- phpBB/styles/subsilver2/template/ucp_groups_manage.html | 2 +- phpBB/styles/subsilver2/template/ucp_profile_avatar.html | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index f9846ea7cd..6049673e0a 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -117,7 +117,7 @@
- + diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index d4e1915076..c4328aa3a6 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -359,6 +359,7 @@ $lang = array_merge($lang, array( ), 'NO_ACTION_MODE' => 'No message action specified.', 'NO_AUTHOR' => 'No author defined for this message', + 'NO_AVATAR' => 'No avatar selected', 'NO_AVATAR_CATEGORY' => 'None', 'NO_AUTH_DELETE_MESSAGE' => 'You are not authorised to delete private messages.', diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html index 4b4581a59c..ca077fdf5b 100644 --- a/phpBB/styles/prosilver/template/ucp_avatar_options.html +++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html @@ -17,7 +17,7 @@
- + diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html index 07b3edb498..fc52c149c6 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html @@ -28,7 +28,7 @@ {L_AVATAR_TYPE}{L_COLON}