diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-09-24 10:28:39 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-09-24 10:28:39 +0200 |
| commit | 1fff45586288fd8bc2027e8dfe366bc4000df065 (patch) | |
| tree | 8fe0b7e983a9011757e90035b1db843706822622 /phpBB/includes | |
| parent | e02dc7a9c154b059b2d89717fb6f3502c94100a2 (diff) | |
| parent | 18f9c9f6e2a382eedc9c8e566b939e6515e1c44f (diff) | |
| download | forums-1fff45586288fd8bc2027e8dfe366bc4000df065.tar forums-1fff45586288fd8bc2027e8dfe366bc4000df065.tar.gz forums-1fff45586288fd8bc2027e8dfe366bc4000df065.tar.bz2 forums-1fff45586288fd8bc2027e8dfe366bc4000df065.tar.xz forums-1fff45586288fd8bc2027e8dfe366bc4000df065.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index fa9ed84a34..0056cbca35 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -225,6 +225,13 @@ class messenger $template_lang = basename($config['default_lang']); } + $ext_template_paths = array( + array( + 'name' => $template_lang . '_email', + 'ext_path' => 'language/' . $template_lang . '/email' . $template_dir_prefix, + ), + ); + if ($template_path) { $template_paths = array( @@ -240,23 +247,38 @@ class messenger $template_path . $template_dir_prefix, ); + $board_language = basename($config['default_lang']); + // we can only specify default language fallback when the path is not a custom one for which we // do not know the default language alternative - if ($template_lang !== basename($config['default_lang'])) + if ($template_lang !== $board_language) + { + $fallback_template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/'; + $fallback_template_path .= $board_language . '/email'; + + $template_paths[] = $fallback_template_path . $template_dir_prefix; + + $ext_template_paths[] = array( + 'name' => $board_language . '_email', + 'ext_path' => 'language/' . $board_language . '/email' . $template_dir_prefix, + ); + } + // If everything fails just fall back to en template + if ($template_lang !== 'en' && $board_language !== 'en') { $fallback_template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/'; - $fallback_template_path .= basename($config['default_lang']) . '/email'; + $fallback_template_path .= 'en/email'; $template_paths[] = $fallback_template_path . $template_dir_prefix; + + $ext_template_paths[] = array( + 'name' => 'en_email', + 'ext_path' => 'language/en/email' . $template_dir_prefix, + ); } } - $this->set_template_paths(array( - array( - 'name' => $template_lang . '_email', - 'ext_path' => 'language/' . $template_lang . '/email' . $template_dir_prefix, - ), - ), $template_paths); + $this->set_template_paths($ext_template_paths, $template_paths); $this->template->set_filenames(array( 'body' => $template_file . '.txt', |