From 12dfc046970f027b5fc934dfa3a60df32e8bf1df Mon Sep 17 00:00:00 2001
From: Exile <iglix@me.com>
Date: Mon, 1 Dec 2014 20:18:26 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=88=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=BD=D0=BE=D0=B2=20email?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Переименовываем шаблоны email для возможности их нормальной локализации через Crowdin.
---
 library/includes/classes/emailer.php                          | 4 ++--
 .../en/email/{admin_send_email.tpl => admin_send_email.html}  | 0
 library/language/en/email/{blank.tpl => blank.html}           | 0
 .../language/en/email/{group_added.tpl => group_added.html}   | 0
 .../en/email/{group_approved.tpl => group_approved.html}      | 0
 .../en/email/{group_request.tpl => group_request.html}        | 0
 .../en/email/{privmsg_notify.tpl => privmsg_notify.html}      | 0
 .../email/{profile_send_email.tpl => profile_send_email.html} | 0
 .../language/en/email/{topic_notify.tpl => topic_notify.html} | 0
 .../en/email/{user_activate.tpl => user_activate.html}        | 0
 .../{user_activate_passwd.tpl => user_activate_passwd.html}   | 0
 .../language/en/email/{user_welcome.tpl => user_welcome.html} | 0
 .../{user_welcome_inactive.tpl => user_welcome_inactive.html} | 0
 .../ru/email/{admin_send_email.tpl => admin_send_email.html}  | 0
 library/language/ru/email/{blank.tpl => blank.html}           | 0
 .../language/ru/email/{group_added.tpl => group_added.html}   | 0
 .../ru/email/{group_approved.tpl => group_approved.html}      | 0
 .../ru/email/{group_request.tpl => group_request.html}        | 0
 .../ru/email/{privmsg_notify.tpl => privmsg_notify.html}      | 0
 .../email/{profile_send_email.tpl => profile_send_email.html} | 0
 .../language/ru/email/{topic_notify.tpl => topic_notify.html} | 0
 .../ru/email/{user_activate.tpl => user_activate.html}        | 0
 .../{user_activate_passwd.tpl => user_activate_passwd.html}   | 0
 .../language/ru/email/{user_welcome.tpl => user_welcome.html} | 0
 .../{user_welcome_inactive.tpl => user_welcome_inactive.html} | 0
 .../uk/email/{admin_send_email.tpl => admin_send_email.html}  | 0
 library/language/uk/email/{blank.tpl => blank.html}           | 0
 .../language/uk/email/{group_added.tpl => group_added.html}   | 0
 .../uk/email/{group_approved.tpl => group_approved.html}      | 0
 .../uk/email/{group_request.tpl => group_request.html}        | 0
 .../uk/email/{privmsg_notify.tpl => privmsg_notify.html}      | 0
 .../email/{profile_send_email.tpl => profile_send_email.html} | 0
 .../language/uk/email/{topic_notify.tpl => topic_notify.html} | 0
 .../uk/email/{user_activate.tpl => user_activate.html}        | 0
 .../{user_activate_passwd.tpl => user_activate_passwd.html}   | 0
 .../language/uk/email/{user_welcome.tpl => user_welcome.html} | 0
 .../{user_welcome_inactive.tpl => user_welcome_inactive.html} | 0
 37 files changed, 2 insertions(+), 2 deletions(-)
 rename library/language/en/email/{admin_send_email.tpl => admin_send_email.html} (100%)
 rename library/language/en/email/{blank.tpl => blank.html} (100%)
 rename library/language/en/email/{group_added.tpl => group_added.html} (100%)
 rename library/language/en/email/{group_approved.tpl => group_approved.html} (100%)
 rename library/language/en/email/{group_request.tpl => group_request.html} (100%)
 rename library/language/en/email/{privmsg_notify.tpl => privmsg_notify.html} (100%)
 rename library/language/en/email/{profile_send_email.tpl => profile_send_email.html} (100%)
 rename library/language/en/email/{topic_notify.tpl => topic_notify.html} (100%)
 rename library/language/en/email/{user_activate.tpl => user_activate.html} (100%)
 rename library/language/en/email/{user_activate_passwd.tpl => user_activate_passwd.html} (100%)
 rename library/language/en/email/{user_welcome.tpl => user_welcome.html} (100%)
 rename library/language/en/email/{user_welcome_inactive.tpl => user_welcome_inactive.html} (100%)
 rename library/language/ru/email/{admin_send_email.tpl => admin_send_email.html} (100%)
 rename library/language/ru/email/{blank.tpl => blank.html} (100%)
 rename library/language/ru/email/{group_added.tpl => group_added.html} (100%)
 rename library/language/ru/email/{group_approved.tpl => group_approved.html} (100%)
 rename library/language/ru/email/{group_request.tpl => group_request.html} (100%)
 rename library/language/ru/email/{privmsg_notify.tpl => privmsg_notify.html} (100%)
 rename library/language/ru/email/{profile_send_email.tpl => profile_send_email.html} (100%)
 rename library/language/ru/email/{topic_notify.tpl => topic_notify.html} (100%)
 rename library/language/ru/email/{user_activate.tpl => user_activate.html} (100%)
 rename library/language/ru/email/{user_activate_passwd.tpl => user_activate_passwd.html} (100%)
 rename library/language/ru/email/{user_welcome.tpl => user_welcome.html} (100%)
 rename library/language/ru/email/{user_welcome_inactive.tpl => user_welcome_inactive.html} (100%)
 rename library/language/uk/email/{admin_send_email.tpl => admin_send_email.html} (100%)
 rename library/language/uk/email/{blank.tpl => blank.html} (100%)
 rename library/language/uk/email/{group_added.tpl => group_added.html} (100%)
 rename library/language/uk/email/{group_approved.tpl => group_approved.html} (100%)
 rename library/language/uk/email/{group_request.tpl => group_request.html} (100%)
 rename library/language/uk/email/{privmsg_notify.tpl => privmsg_notify.html} (100%)
 rename library/language/uk/email/{profile_send_email.tpl => profile_send_email.html} (100%)
 rename library/language/uk/email/{topic_notify.tpl => topic_notify.html} (100%)
 rename library/language/uk/email/{user_activate.tpl => user_activate.html} (100%)
 rename library/language/uk/email/{user_activate_passwd.tpl => user_activate_passwd.html} (100%)
 rename library/language/uk/email/{user_welcome.tpl => user_welcome.html} (100%)
 rename library/language/uk/email/{user_welcome_inactive.tpl => user_welcome_inactive.html} (100%)

diff --git a/library/includes/classes/emailer.php b/library/includes/classes/emailer.php
index 3c94a0e89..550dd6900 100644
--- a/library/includes/classes/emailer.php
+++ b/library/includes/classes/emailer.php
@@ -98,11 +98,11 @@ class emailer
 
 		if (empty($this->tpl_msg[$template_lang . $template_file]))
 		{
-			$tpl_file = LANG_ROOT_DIR ."$template_lang/email/$template_file.tpl";
+			$tpl_file = LANG_ROOT_DIR ."$template_lang/email/$template_file.html";
 
 			if (!@file_exists(@bb_realpath($tpl_file)))
 			{
-				$tpl_file = LANG_ROOT_DIR ."{$bb_cfg['default_lang']}/email/$template_file.tpl";
+				$tpl_file = LANG_ROOT_DIR ."{$bb_cfg['default_lang']}/email/$template_file.html";
 
 				if (!@file_exists(@bb_realpath($tpl_file)))
 				{
diff --git a/library/language/en/email/admin_send_email.tpl b/library/language/en/email/admin_send_email.html
similarity index 100%
rename from library/language/en/email/admin_send_email.tpl
rename to library/language/en/email/admin_send_email.html
diff --git a/library/language/en/email/blank.tpl b/library/language/en/email/blank.html
similarity index 100%
rename from library/language/en/email/blank.tpl
rename to library/language/en/email/blank.html
diff --git a/library/language/en/email/group_added.tpl b/library/language/en/email/group_added.html
similarity index 100%
rename from library/language/en/email/group_added.tpl
rename to library/language/en/email/group_added.html
diff --git a/library/language/en/email/group_approved.tpl b/library/language/en/email/group_approved.html
similarity index 100%
rename from library/language/en/email/group_approved.tpl
rename to library/language/en/email/group_approved.html
diff --git a/library/language/en/email/group_request.tpl b/library/language/en/email/group_request.html
similarity index 100%
rename from library/language/en/email/group_request.tpl
rename to library/language/en/email/group_request.html
diff --git a/library/language/en/email/privmsg_notify.tpl b/library/language/en/email/privmsg_notify.html
similarity index 100%
rename from library/language/en/email/privmsg_notify.tpl
rename to library/language/en/email/privmsg_notify.html
diff --git a/library/language/en/email/profile_send_email.tpl b/library/language/en/email/profile_send_email.html
similarity index 100%
rename from library/language/en/email/profile_send_email.tpl
rename to library/language/en/email/profile_send_email.html
diff --git a/library/language/en/email/topic_notify.tpl b/library/language/en/email/topic_notify.html
similarity index 100%
rename from library/language/en/email/topic_notify.tpl
rename to library/language/en/email/topic_notify.html
diff --git a/library/language/en/email/user_activate.tpl b/library/language/en/email/user_activate.html
similarity index 100%
rename from library/language/en/email/user_activate.tpl
rename to library/language/en/email/user_activate.html
diff --git a/library/language/en/email/user_activate_passwd.tpl b/library/language/en/email/user_activate_passwd.html
similarity index 100%
rename from library/language/en/email/user_activate_passwd.tpl
rename to library/language/en/email/user_activate_passwd.html
diff --git a/library/language/en/email/user_welcome.tpl b/library/language/en/email/user_welcome.html
similarity index 100%
rename from library/language/en/email/user_welcome.tpl
rename to library/language/en/email/user_welcome.html
diff --git a/library/language/en/email/user_welcome_inactive.tpl b/library/language/en/email/user_welcome_inactive.html
similarity index 100%
rename from library/language/en/email/user_welcome_inactive.tpl
rename to library/language/en/email/user_welcome_inactive.html
diff --git a/library/language/ru/email/admin_send_email.tpl b/library/language/ru/email/admin_send_email.html
similarity index 100%
rename from library/language/ru/email/admin_send_email.tpl
rename to library/language/ru/email/admin_send_email.html
diff --git a/library/language/ru/email/blank.tpl b/library/language/ru/email/blank.html
similarity index 100%
rename from library/language/ru/email/blank.tpl
rename to library/language/ru/email/blank.html
diff --git a/library/language/ru/email/group_added.tpl b/library/language/ru/email/group_added.html
similarity index 100%
rename from library/language/ru/email/group_added.tpl
rename to library/language/ru/email/group_added.html
diff --git a/library/language/ru/email/group_approved.tpl b/library/language/ru/email/group_approved.html
similarity index 100%
rename from library/language/ru/email/group_approved.tpl
rename to library/language/ru/email/group_approved.html
diff --git a/library/language/ru/email/group_request.tpl b/library/language/ru/email/group_request.html
similarity index 100%
rename from library/language/ru/email/group_request.tpl
rename to library/language/ru/email/group_request.html
diff --git a/library/language/ru/email/privmsg_notify.tpl b/library/language/ru/email/privmsg_notify.html
similarity index 100%
rename from library/language/ru/email/privmsg_notify.tpl
rename to library/language/ru/email/privmsg_notify.html
diff --git a/library/language/ru/email/profile_send_email.tpl b/library/language/ru/email/profile_send_email.html
similarity index 100%
rename from library/language/ru/email/profile_send_email.tpl
rename to library/language/ru/email/profile_send_email.html
diff --git a/library/language/ru/email/topic_notify.tpl b/library/language/ru/email/topic_notify.html
similarity index 100%
rename from library/language/ru/email/topic_notify.tpl
rename to library/language/ru/email/topic_notify.html
diff --git a/library/language/ru/email/user_activate.tpl b/library/language/ru/email/user_activate.html
similarity index 100%
rename from library/language/ru/email/user_activate.tpl
rename to library/language/ru/email/user_activate.html
diff --git a/library/language/ru/email/user_activate_passwd.tpl b/library/language/ru/email/user_activate_passwd.html
similarity index 100%
rename from library/language/ru/email/user_activate_passwd.tpl
rename to library/language/ru/email/user_activate_passwd.html
diff --git a/library/language/ru/email/user_welcome.tpl b/library/language/ru/email/user_welcome.html
similarity index 100%
rename from library/language/ru/email/user_welcome.tpl
rename to library/language/ru/email/user_welcome.html
diff --git a/library/language/ru/email/user_welcome_inactive.tpl b/library/language/ru/email/user_welcome_inactive.html
similarity index 100%
rename from library/language/ru/email/user_welcome_inactive.tpl
rename to library/language/ru/email/user_welcome_inactive.html
diff --git a/library/language/uk/email/admin_send_email.tpl b/library/language/uk/email/admin_send_email.html
similarity index 100%
rename from library/language/uk/email/admin_send_email.tpl
rename to library/language/uk/email/admin_send_email.html
diff --git a/library/language/uk/email/blank.tpl b/library/language/uk/email/blank.html
similarity index 100%
rename from library/language/uk/email/blank.tpl
rename to library/language/uk/email/blank.html
diff --git a/library/language/uk/email/group_added.tpl b/library/language/uk/email/group_added.html
similarity index 100%
rename from library/language/uk/email/group_added.tpl
rename to library/language/uk/email/group_added.html
diff --git a/library/language/uk/email/group_approved.tpl b/library/language/uk/email/group_approved.html
similarity index 100%
rename from library/language/uk/email/group_approved.tpl
rename to library/language/uk/email/group_approved.html
diff --git a/library/language/uk/email/group_request.tpl b/library/language/uk/email/group_request.html
similarity index 100%
rename from library/language/uk/email/group_request.tpl
rename to library/language/uk/email/group_request.html
diff --git a/library/language/uk/email/privmsg_notify.tpl b/library/language/uk/email/privmsg_notify.html
similarity index 100%
rename from library/language/uk/email/privmsg_notify.tpl
rename to library/language/uk/email/privmsg_notify.html
diff --git a/library/language/uk/email/profile_send_email.tpl b/library/language/uk/email/profile_send_email.html
similarity index 100%
rename from library/language/uk/email/profile_send_email.tpl
rename to library/language/uk/email/profile_send_email.html
diff --git a/library/language/uk/email/topic_notify.tpl b/library/language/uk/email/topic_notify.html
similarity index 100%
rename from library/language/uk/email/topic_notify.tpl
rename to library/language/uk/email/topic_notify.html
diff --git a/library/language/uk/email/user_activate.tpl b/library/language/uk/email/user_activate.html
similarity index 100%
rename from library/language/uk/email/user_activate.tpl
rename to library/language/uk/email/user_activate.html
diff --git a/library/language/uk/email/user_activate_passwd.tpl b/library/language/uk/email/user_activate_passwd.html
similarity index 100%
rename from library/language/uk/email/user_activate_passwd.tpl
rename to library/language/uk/email/user_activate_passwd.html
diff --git a/library/language/uk/email/user_welcome.tpl b/library/language/uk/email/user_welcome.html
similarity index 100%
rename from library/language/uk/email/user_welcome.tpl
rename to library/language/uk/email/user_welcome.html
diff --git a/library/language/uk/email/user_welcome_inactive.tpl b/library/language/uk/email/user_welcome_inactive.html
similarity index 100%
rename from library/language/uk/email/user_welcome_inactive.tpl
rename to library/language/uk/email/user_welcome_inactive.html