diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-25 13:34:10 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-25 13:34:10 -0500 |
| commit | bea1ce92a1ba11714217d2837875595bd309c26d (patch) | |
| tree | 31bc49e10beab8e9d20ed08bd96e12325b72ef8b /phpBB/install/install_update.php | |
| parent | 5ebc36f5833bb89126711a0e09204490ba33fb1d (diff) | |
| parent | 162ea10b6afdd7a3b6d1f953e250436d83324a5b (diff) | |
| download | forums-bea1ce92a1ba11714217d2837875595bd309c26d.tar forums-bea1ce92a1ba11714217d2837875595bd309c26d.tar.gz forums-bea1ce92a1ba11714217d2837875595bd309c26d.tar.bz2 forums-bea1ce92a1ba11714217d2837875595bd309c26d.tar.xz forums-bea1ce92a1ba11714217d2837875595bd309c26d.zip | |
Merge branch 'develop-olympus' into develop
# By Oliver Schramm
# Via Nathaniel Guse (1) and Oliver Schramm (1)
* develop-olympus:
[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/install_update.php')
| -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 df9b6c1c7e..92e94d5503 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -229,7 +229,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); |