diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-25 13:32:23 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-25 13:32:23 -0500 |
| commit | 162ea10b6afdd7a3b6d1f953e250436d83324a5b (patch) | |
| tree | f39a8c343aaa48b6b2d3d8b32fc72bef436baec5 /phpBB/install | |
| parent | 76a7d544cf8ac09229ac4c1eb17d4ded51fc92e3 (diff) | |
| parent | 7304ac9c3ca817716f14bb8817a201b149e5ebef (diff) | |
| download | forums-162ea10b6afdd7a3b6d1f953e250436d83324a5b.tar forums-162ea10b6afdd7a3b6d1f953e250436d83324a5b.tar.gz forums-162ea10b6afdd7a3b6d1f953e250436d83324a5b.tar.bz2 forums-162ea10b6afdd7a3b6d1f953e250436d83324a5b.tar.xz forums-162ea10b6afdd7a3b6d1f953e250436d83324a5b.zip | |
Merge remote-tracking branch 'remotes/Elsensee/ticket/11062' into develop-olympus
# By Oliver Schramm
# Via Oliver Schramm
* remotes/Elsensee/ticket/11062:
[ticket/11062] If user's language is english there is no further work needed
[ticket/11062] Load new strings from user's language file if provided
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/install_update.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index c18a0fb4ec..9823703f0a 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -232,7 +232,14 @@ class install_update extends module } // What about the language file? Got it updated? - if (in_array('language/en/install.' . $phpEx, $this->update_info['files'])) + if (in_array('language/' . $language . '/install.' . $phpEx, $this->update_info['files'])) + { + $lang = array(); + include($this->new_location . 'language/' . $language . '/install.' . $phpEx); + // this is the user's language.. just merge it + $user->lang = array_merge($user->lang, $lang); + } + if ($language != 'en' && in_array('language/en/install.' . $phpEx, $this->update_info['files'])) { $lang = array(); include($this->new_location . 'language/en/install.' . $phpEx); |