mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-12 20:56:40 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
# 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
This commit is contained in:
Nathaniel Guse
2013-07-25 13:34:10 -05:00
parent 5ebc36f583 162ea10b6a
commit bea1ce92a1
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/install/install_update.php
View File

@ -229,7 +229,14 @@ class install_update extends module
} }
// What about the language file? Got it updated? // 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(); $lang = array();
include($this->new_location . 'language/en/install.' . $phpEx); include($this->new_location . 'language/en/install.' . $phpEx);